From 4bfe2ef55d6b17fa8007d07d762fea4005a717a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:44:16 -0600 Subject: [PATCH] Rename additional instances of KDE to TDE --- dcopjava/binding/Makefile.am | 2 +- dcopjava/dcopidl2java/Makefile.am | 2 +- dcopjava/tests/Makefile.am | 2 +- dcoppython/test/dcopserver/Makefile.am | 4 ++-- kdejava/koala/Makefile.am | 2 +- kdejava/koala/kdejava/KDESupport.h | 4 ++-- kjsembed/Makefile.am | 6 +++--- kjsembed/bindings/Makefile.am | 2 +- kjsembed/builtins/Makefile.am | 4 ++-- kjsembed/cpptests/jsaccess/Makefile.am | 2 +- kjsembed/docs/embedding/simple-embed/Makefile.am | 4 ++-- kjsembed/plugins/Makefile.am | 8 ++++---- kjsembed/qtbindings/Makefile.am | 2 +- korundum/rubylib/rbkconfig_compiler/Makefile.am | 4 ++-- smoke/kde/Makefile.am | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index 84f88d23..8baebffb 100644 --- a/dcopjava/binding/Makefile.am +++ b/dcopjava/binding/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libjavadcop.la libjavadcop_la_SOURCES = client.cpp libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -libjavadcop_la_LIBADD = $(LIB_KDECORE) +libjavadcop_la_LIBADD = $(LIB_TDECORE) INCLUDES = $(jni_includes) $(all_includes) diff --git a/dcopjava/dcopidl2java/Makefile.am b/dcopjava/dcopidl2java/Makefile.am index e525955b..494e5b73 100644 --- a/dcopjava/dcopidl2java/Makefile.am +++ b/dcopjava/dcopidl2java/Makefile.am @@ -7,5 +7,5 @@ dcopidl2java_SOURCES = main.cpp skel.cpp stubimpl.cpp noinst_HEADERS = main.h dcopidl2java_LDADD = $(LIB_QT) -dcopidl2java_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +dcopidl2java_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/dcopjava/tests/Makefile.am b/dcopjava/tests/Makefile.am index 847d3c53..9c67d37e 100644 --- a/dcopjava/tests/Makefile.am +++ b/dcopjava/tests/Makefile.am @@ -4,7 +4,7 @@ check_PROGRAMS = server test.class server_SOURCES = main.cpp test.skel test_impl.cpp server_LDFLAGS = $(all_libraries) -server_LDADD = $(LIB_KDECORE) +server_LDADD = $(LIB_TDECORE) # test_class_SOURCES = test.java diff --git a/dcoppython/test/dcopserver/Makefile.am b/dcoppython/test/dcopserver/Makefile.am index 96fae9de..df3acb86 100644 --- a/dcoppython/test/dcopserver/Makefile.am +++ b/dcoppython/test/dcopserver/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = kdedcoptest # the application source, library search path, and link libraries kdedcoptest_SOURCES = main.cpp kdedcoptest.cpp kdedcoptest_iface.skel mainclass.cpp -kdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kdedcoptest_LDADD = $(LIB_KDEUI) +kdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdedcoptest_LDADD = $(LIB_TDEUI) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am index 80dfbe6d..e4d38535 100644 --- a/kdejava/koala/Makefile.am +++ b/kdejava/koala/Makefile.am @@ -36,7 +36,7 @@ INCLUDES= $(all_includes) koala_METASOURCES = AUTO # the library search path. -koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # them while "make clean", use CLEANFILES CLEANFILES = koala.jar diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h index cf31f971..2e6b6914 100644 --- a/kdejava/koala/kdejava/KDESupport.h +++ b/kdejava/koala/kdejava/KDESupport.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KDESUPPORT_H -#define KDESUPPORT_H +#ifndef TDESUPPORT_H +#define TDESUPPORT_H #include diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index a87147a9..bdccbc04 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -48,17 +48,17 @@ kjsembedinclude_HEADERS = jsconsolewidget.h \ jsbindingplugin.h \ global.h -libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KJS) +libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS) libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \ builtins/libkjsembedbuiltins.la \ qtbindings/libkjsembedqtbindings.la \ -lqui \ - $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \ + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \ $(LIB_KFILE) $(LIB_KHTML) -lkjs $(LIBSOCKET) kjscmd_SOURCES = kjscmd.cpp -kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KJS) +kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS) kjscmd_LDADD = libkjsembed.la man_MANS = kjscmd.1 diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index 95b634bd..cc7cac22 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -21,7 +21,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \ size_imp.cpp libkjsembedbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \ +libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \ $(LIB_KFILE) $(LIBSOCKET) libkjsembedbindings_la_METASOURCES = AUTO diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am index a16109b9..bf12fcf8 100644 --- a/kjsembed/builtins/Makefile.am +++ b/kjsembed/builtins/Makefile.am @@ -11,8 +11,8 @@ libkjsembedbuiltins_la_SOURCES = stdaction_imp.cpp \ qdir_imp.cpp \ qfile_imp.cpp -libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \ +libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \ $(LIB_KFILE) -lkjs $(LIBSOCKET) libkjsembedbuiltins_la_METASOURCES = AUTO diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am index 1d3a1a66..d7296b03 100644 --- a/kjsembed/cpptests/jsaccess/Makefile.am +++ b/kjsembed/cpptests/jsaccess/Makefile.am @@ -8,7 +8,7 @@ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST noinst_PROGRAMS = jsaccess jsaccess_SOURCES = jsaccess.cpp -jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KJS) +jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS) jsaccess_LDADD = $(top_builddir)/kjsembed/libkjsembed.la METASOURCES = AUTO diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am index f3757571..2c9243a3 100644 --- a/kjsembed/docs/embedding/simple-embed/Makefile.am +++ b/kjsembed/docs/embedding/simple-embed/Makefile.am @@ -8,10 +8,10 @@ bin_PROGRAMS = embedjs INCLUDES = -I$(top_srcdir) $(all_includes) # the library search path. -embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. -embedjs_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la +embedjs_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la # which sources should be compiled for embedjs embedjs_SOURCES = main.cpp embedview.ui embedviewimp.cpp diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index d7d3ce70..5468d792 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -8,22 +8,22 @@ METASOURCES = AUTO # the Plugin's source, library search path, and link libraries libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la +libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la +libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libimagefxplugin_la_SOURCES = imagefx_plugin.cpp libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la +libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libqprocessplugin_la_SOURCES = qprocess_plugin.cpp libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la +libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libfileitemplugin_la_SOURCES = kfileitemloader.cpp diff --git a/kjsembed/qtbindings/Makefile.am b/kjsembed/qtbindings/Makefile.am index 7fde7610..5c1af082 100644 --- a/kjsembed/qtbindings/Makefile.am +++ b/kjsembed/qtbindings/Makefile.am @@ -28,7 +28,7 @@ libkjsembedqtbindings_la_SOURCES = qlistviewitem_imp.cpp \ qmenuitem_imp.cpp libkjsembedqtbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -libkjsembedqtbindings_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) +libkjsembedqtbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) libkjsembedqtbindings_la_METASOURCES = AUTO diff --git a/korundum/rubylib/rbkconfig_compiler/Makefile.am b/korundum/rubylib/rbkconfig_compiler/Makefile.am index 7f38dbcb..30aa4328 100644 --- a/korundum/rubylib/rbkconfig_compiler/Makefile.am +++ b/korundum/rubylib/rbkconfig_compiler/Makefile.am @@ -12,8 +12,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes) bin_PROGRAMS = rbkconfig_compiler -rbkconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -rbkconfig_compiler_LDADD = $(LIB_KDECORE) +rbkconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +rbkconfig_compiler_LDADD = $(LIB_TDECORE) rbkconfig_compiler_SOURCES = rbkconfig_compiler.cpp METASOURCES = AUTO diff --git a/smoke/kde/Makefile.am b/smoke/kde/Makefile.am index a7fc91a8..ed7a1d8f 100644 --- a/smoke/kde/Makefile.am +++ b/smoke/kde/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH) # the libraries to link against. -libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) +libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \