summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:01:46 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:58:07 +0200
commit1a67db64ab6ed9f8d43b38b2c3b2b950fdb162b4 (patch)
tree6c5cd20708660b14a3c64317869b428dced17977
parent995a1997819acc15cf3bd0f1ec2b49251829175a (diff)
downloadtdeartwork-1a67db64ab6ed9f8d43b38b2c3b2b950fdb162b4.tar.gz
tdeartwork-1a67db64ab6ed9f8d43b38b2c3b2b950fdb162b4.zip
Additional k => tde renaming and fixes
-rw-r--r--tdescreensaver/kdesavers/Makefile.am4
-rw-r--r--tdescreensaver/kxsconfig/Makefile.am8
-rw-r--r--tdescreensaver/tdepartsaver/Makefile.am4
-rw-r--r--tdescreensaver/tdepartsaver/tdepartsaver.h4
-rw-r--r--tdescreensaver/xsavers/Makefile.am2
-rw-r--r--twin-styles/icewm/config/Makefile.am2
6 files changed, 12 insertions, 12 deletions
diff --git a/tdescreensaver/kdesavers/Makefile.am b/tdescreensaver/kdesavers/Makefile.am
index 1952c5df..9a2f1adb 100644
--- a/tdescreensaver/kdesavers/Makefile.am
+++ b/tdescreensaver/kdesavers/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = . data
AM_CPPFLAGS = -UQT_NO_ASCII_CAST
INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
AM_LDADD = $(LIB_TDEUI) -ltdescreensaver
if COMPILE_X11_KSAVERS
@@ -42,7 +42,7 @@ kbanner_kss_LDADD = $(AM_LDADD)
kpolygon_kss_SOURCES = polygon.cpp
kpolygon_kss_LDADD = $(AM_LDADD)
kslideshow_kss_SOURCES = slideshow.cpp slideshowcfg.ui
-kslideshow_kss_LDADD = $(LIB_TDEFILE) $(AM_LDADD) $(LIB_KSYCOCA) -lm
+kslideshow_kss_LDADD = $(LIB_TDEFILE) $(AM_LDADD) $(LIB_TDESYCOCA) -lm
klines_kss_SOURCES = lines.cpp
klines_kss_LDADD = $(AM_LDADD)
klorenz_kss_SOURCES = lorenz.cpp
diff --git a/tdescreensaver/kxsconfig/Makefile.am b/tdescreensaver/kxsconfig/Makefile.am
index e0b89f67..7588e80c 100644
--- a/tdescreensaver/kxsconfig/Makefile.am
+++ b/tdescreensaver/kxsconfig/Makefile.am
@@ -1,11 +1,11 @@
## Makefile.am of tdebase/tdescreensaver/kxsconfig
INCLUDES = $(all_includes)
-kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kxsconfig_LDADD = $(LIB_KIO) -lXt
+kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kxsconfig_LDADD = $(LIB_TDEIO) -lXt
-kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kxsrun_LDADD = $(LIB_KIO)
+kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kxsrun_LDADD = $(LIB_TDEIO)
EXTRA_DIST = ScreenSavers hacks.pot
diff --git a/tdescreensaver/tdepartsaver/Makefile.am b/tdescreensaver/tdepartsaver/Makefile.am
index 7ee74621..0a6fc981 100644
--- a/tdescreensaver/tdepartsaver/Makefile.am
+++ b/tdescreensaver/tdepartsaver/Makefile.am
@@ -2,8 +2,8 @@ bin_PROGRAMS = tdepartsaver.kss
INCLUDES = $(all_includes)
tdepartsaver_kss_SOURCES = tdepartsaver.cpp configwidget.ui
-tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdepartsaver_kss_LDADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdescreensaver
+tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdepartsaver_kss_LDADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdescreensaver
METASOURCES = AUTO
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h
index 8ce95052..cfb456cc 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.h
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.h
@@ -16,8 +16,8 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KPARTSAVER_H_INCLUDED
-#define KPARTSAVER_H_INCLUDED
+#ifndef TDEPARTSAVER_H_INCLUDED
+#define TDEPARTSAVER_H_INCLUDED
#include <tqwidget.h>
diff --git a/tdescreensaver/xsavers/Makefile.am b/tdescreensaver/xsavers/Makefile.am
index 6510fd32..94241454 100644
--- a/tdescreensaver/xsavers/Makefile.am
+++ b/tdescreensaver/xsavers/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
INCLUDES = $(all_includes) $(GLINC)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
if COMPILE_GL_XSAVERS
GL_XSAVERS=kspace.kss
diff --git a/twin-styles/icewm/config/Makefile.am b/twin-styles/icewm/config/Makefile.am
index ca2d2552..b2b9b857 100644
--- a/twin-styles/icewm/config/Makefile.am
+++ b/twin-styles/icewm/config/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = twin_icewm_config.la
twin_icewm_config_la_SOURCES = config.cpp
twin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+twin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
METASOURCES = AUTO
noinst_HEADERS = config.h