From 208bab01eb4a9bad1184bad3b217593c6a71fa00 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:36:08 -0600 Subject: [PATCH] Rename additional instances of KDE to TDE --- conduits/docconduit/Makefile.am | 4 ++-- conduits/knotes/Makefile.am | 2 +- conduits/malconduit/Makefile.am | 2 +- conduits/memofileconduit/Makefile.am | 2 +- conduits/notepadconduit/Makefile.am | 2 +- conduits/null/Makefile.am | 2 +- conduits/recordconduit/Makefile.am | 2 +- conduits/sysinfoconduit/Makefile.am | 2 +- conduits/timeconduit/Makefile.am | 2 +- kpilot/Makefile.am | 10 +++++----- lib/Makefile.am | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index 2f2f082..8302d5a 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -23,12 +23,12 @@ libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB) conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ - $(LIB_KDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) + $(LIB_TDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ##libpalmdoc_shared.la kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp -kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la xdg_apps_DATA = kpalmdoc.desktop diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am index 44005f9..6d1f7d1 100644 --- a/conduits/knotes/Makefile.am +++ b/conduits/knotes/Makefile.am @@ -16,6 +16,6 @@ conduit_knotes_la_SOURCES = \ setup_base.ui conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) +conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) kde_kcfg_DATA = knotesconduit.kcfg diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am index bb2388a..6754bda 100644 --- a/conduits/malconduit/Makefile.am +++ b/conduits/malconduit/Makefile.am @@ -14,5 +14,5 @@ kde_module_LTLIBRARIES = conduit_mal.la conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI) +conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI) diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am index 6b8d5f1..4d61ba7 100644 --- a/conduits/memofileconduit/Makefile.am +++ b/conduits/memofileconduit/Makefile.am @@ -11,6 +11,6 @@ kde_module_LTLIBRARIES = conduit_memofile.la conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE) +conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KFILE) kde_kcfg_DATA = memofileconduit.kcfg diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am index efe0794..d66ea92 100644 --- a/conduits/notepadconduit/Makefile.am +++ b/conduits/notepadconduit/Makefile.am @@ -10,5 +10,5 @@ kde_module_LTLIBRARIES = conduit_notepad.la conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ notepad-conduit.cc notepad-factory.cc conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) +conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO) diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am index db7598c..947182c 100644 --- a/conduits/null/Makefile.am +++ b/conduits/null/Makefile.am @@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = conduit_null.la conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) +conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) kde_kcfg_DATA = nullconduit.kcfg diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am index 03b55e0..3a5ffbd 100644 --- a/conduits/recordconduit/Makefile.am +++ b/conduits/recordconduit/Makefile.am @@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = conduit_record.la conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) +conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) kde_kcfg_DATA = settings.kcfg diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am index 732fbb2..1ea616d 100644 --- a/conduits/sysinfoconduit/Makefile.am +++ b/conduits/sysinfoconduit/Makefile.am @@ -16,7 +16,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \ sysinfo-conduit.cc \ sysinfo-setup_dialog.ui conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) +conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO) kpilot_sysinfo_data_DATA = Template.html Template.txt kpilot_sysinfo_datadir = $(kde_datadir)/kpilot/sysinfoconduit diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am index a39c2d8..06894c4 100644 --- a/conduits/timeconduit/Makefile.am +++ b/conduits/timeconduit/Makefile.am @@ -17,6 +17,6 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \ time-conduit.cc \ time-setup_dialog.ui conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) +conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) kde_kcfg_DATA = timeconduit.kcfg diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am index d8d27ec..ef4caa7 100644 --- a/kpilot/Makefile.am +++ b/kpilot/Makefile.am @@ -18,7 +18,7 @@ METASOURCES = AUTO INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes) libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc -libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigDialog_device.ui \ @@ -35,7 +35,7 @@ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigWizard_app.ui \ kpilotConfigWizard.cc \ dbSelectionDialog.cc dbSelection_base.ui -kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module -avoid-version -no-undefined +kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module -avoid-version -no-undefined kcm_kpilot_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la \ libconfiguration.la @@ -68,9 +68,9 @@ kpilotTest_SOURCES = \ main-test.cc -kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, diff --git a/lib/Makefile.am b/lib/Makefile.am index f45272e..a603bd5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -29,7 +29,7 @@ libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \ pilotTodoEntry.cc libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH) -libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal +libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_KABC) -lkcal kpilotincludedir = $(includedir)/kpilot kpilotinclude_HEADERS = \