diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:23:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:23:53 -0600 |
| commit | 7356d68eea4e18a43d32286e055d4d539205a9f2 (patch) | |
| tree | 0985230231bfc40ecb66bc0a5b6df038d513f711 | |
| parent | 03fdb0c73100088786f95a2ef58b38d6c4f8226f (diff) | |
| download | kpilot-7356d68eea4e18a43d32286e055d4d539205a9f2.tar.gz kpilot-7356d68eea4e18a43d32286e055d4d539205a9f2.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | conduits/docconduit/Makefile.am | 4 | ||||
| -rw-r--r-- | conduits/memofileconduit/Makefile.am | 2 | ||||
| -rw-r--r-- | kpilot/Makefile.am | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index d7a3340..617df41 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -23,13 +23,13 @@ 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_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ - $(LIB_TDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) + $(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_KIO) -ltdetexteditor -kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la +kpalmdoc_LDADD = $(LIB_TDEFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la xdg_apps_DATA = kpalmdoc.desktop servicetypedir = $(kde_servicetypesdir) diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am index 69e7f4b..72936dd 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 -ltdeio -ltdeui -conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KFILE) +conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEFILE) kde_kcfg_DATA = memofileconduit.kcfg diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am index 0426112..6e71abc 100644 --- a/kpilot/Makefile.am +++ b/kpilot/Makefile.am @@ -36,7 +36,7 @@ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigWizard.cc \ dbSelectionDialog.cc dbSelection_base.ui kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module -avoid-version -no-undefined -kcm_kpilot_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) \ +kcm_kpilot_la_LIBADD = $(LIB_TDEFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la \ libconfiguration.la @@ -75,11 +75,11 @@ kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) - # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kpilot_LDADD = $(LIB_KFILE) $(PISOCK_LIB) -ltdeutils \ +kpilot_LDADD = $(LIB_TDEFILE) $(PISOCK_LIB) -ltdeutils \ ../lib/libkpilot.la libconfiguration.la -kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \ +kpilotDaemon_LDADD = $(LIB_TDEFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la libconfiguration.la -kpilotTest_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \ +kpilotTest_LDADD = $(LIB_TDEFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la libconfiguration.la xdg_apps_DATA = kpilot.desktop kpilotdaemon.desktop |