diff options
author | Michele Calgaro <[email protected]> | 2018-09-17 23:20:29 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2018-09-17 23:20:29 +0900 |
commit | 38d7b2a492979302d1fc2db870aeb8850a954417 (patch) | |
tree | e85004bd4a098df8f228d646d180f28823abb004 | |
parent | 9abc4fc0d543a9e2cec15d1f392863d2916b7f6f (diff) | |
download | kpilot-38d7b2a492979302d1fc2db870aeb8850a954417.tar.gz kpilot-38d7b2a492979302d1fc2db870aeb8850a954417.zip |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r-- | conduits/abbrowserconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/docconduit/Makefile.am | 4 | ||||
-rw-r--r-- | conduits/knotes/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/malconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/memofileconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/notepadconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/null/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/popmail/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/recordconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/sysinfoconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/timeconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/vcalconduit/Makefile.am | 4 | ||||
-rw-r--r-- | kpilot/Makefile.am | 10 | ||||
-rw-r--r-- | lib/Makefile.am | 2 |
14 files changed, 20 insertions, 20 deletions
diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am index 8aaf6a1..51d4baf 100644 --- a/conduits/abbrowserconduit/Makefile.am +++ b/conduits/abbrowserconduit/Makefile.am @@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \ abbrowser-setup.cc \ tdeabcRecord.cc \ abbrowser-conduit.cc -conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui +conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_address_la_LIBADD = ../../lib/libkpilot.la -ltdeabc -ltdeabc_file servicedir = $(kde_servicesdir) diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index 2e1f79c..291825d 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -21,14 +21,14 @@ libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) 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 -ltdeio -ltdeui +conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ $(LIB_TDEUI) $(LIB_TDEFILE) $(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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kpalmdoc_LDADD = $(LIB_TDEFILE) $(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 5a9e8b6..9922d14 100644 --- a/conduits/knotes/Makefile.am +++ b/conduits/knotes/Makefile.am @@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \ knotes-action.cc \ setup_base.ui -conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal +conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lkcal 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 2a46ce8..6f9825a 100644 --- a/conduits/malconduit/Makefile.am +++ b/conduits/malconduit/Makefile.am @@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg 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 -ltdeio -ltdeui +conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI) diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am index 72936dd..b9e7ab9 100644 --- a/conduits/memofileconduit/Makefile.am +++ b/conduits/memofileconduit/Makefile.am @@ -10,7 +10,7 @@ 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 -ltdeio -ltdeui +conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEFILE) kde_kcfg_DATA = memofileconduit.kcfg diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am index 33ab473..d5d9956 100644 --- a/conduits/notepadconduit/Makefile.am +++ b/conduits/notepadconduit/Makefile.am @@ -9,6 +9,6 @@ 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 -ltdeio -ltdeui +conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO) diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am index 4851f52..71dc9da 100644 --- a/conduits/null/Makefile.am +++ b/conduits/null/Makefile.am @@ -9,7 +9,7 @@ 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 -ltdeio -ltdeui +conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) kde_kcfg_DATA = nullconduit.kcfg diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am index cc1e444..c892849 100644 --- a/conduits/popmail/Makefile.am +++ b/conduits/popmail/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ popmail-factory.cc setupDialog.cc \ popmail-conduit.cc -conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lDCOP +conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lDCOP conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEIO) # this option you can leave out. Just, if you use "make dist", you need it diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am index 1ae2c59..c024754 100644 --- a/conduits/recordconduit/Makefile.am +++ b/conduits/recordconduit/Makefile.am @@ -9,7 +9,7 @@ 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 -ltdeio -ltdeui +conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui 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 d8f48ae..f77d086 100644 --- a/conduits/sysinfoconduit/Makefile.am +++ b/conduits/sysinfoconduit/Makefile.am @@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \ sysinfo-setup.cc \ sysinfo-conduit.cc \ sysinfo-setup_dialog.ui -conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui +conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO) kpilot_sysinfo_data_DATA = Template.html Template.txt diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am index a05d767..b7326d6 100644 --- a/conduits/timeconduit/Makefile.am +++ b/conduits/timeconduit/Makefile.am @@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \ time-setup.cc \ time-conduit.cc \ time-setup_dialog.ui -conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui +conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) kde_kcfg_DATA = timeconduit.kcfg diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am index 4650af8..415fde8 100644 --- a/conduits/vcalconduit/Makefile.am +++ b/conduits/vcalconduit/Makefile.am @@ -24,14 +24,14 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ vcal-factory.cc vcal-setup.cc -conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources +conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \ libvcalconduit_shared.la conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ todo-factory.cc todo-setup.cc -conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources +conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources conduit_todo_la_LIBADD = ../../lib/libkpilot.la \ libvcalconduit_shared.la conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am index e715651..2c5662a 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module -avoid-version -no-undefined +kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module -avoid-version -no-undefined kcm_kpilot_la_LIBADD = $(LIB_TDEFILE) $(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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, diff --git a/lib/Makefile.am b/lib/Makefile.am index 2da70b3..94c5fe9 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_TDEUI) $(LIB_TDEABC) -lkcal $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEIO) +libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_TDEABC) -lkcal $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEIO) kpilotincludedir = $(includedir)/kpilot kpilotinclude_HEADERS = \ |