TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a few build variables for overall consistency

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 03fdb0c731
commit 7356d68eea
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

4
conduits/docconduit/Makefile.am
Unescape View File

@ -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_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_QT) -ltdecore -ltdeio -ltdeui
conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ 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 ##libpalmdoc_shared.la
kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp 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_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 xdg_apps_DATA = kpalmdoc.desktop
servicetypedir = $(kde_servicetypesdir) servicetypedir = $(kde_servicetypesdir)

2
conduits/memofileconduit/Makefile.am
Unescape View File

@ -11,6 +11,6 @@ kde_module_LTLIBRARIES = conduit_memofile.la
conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc 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_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 kde_kcfg_DATA = memofileconduit.kcfg

8
kpilot/Makefile.am
Unescape View File

@ -36,7 +36,7 @@ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \
kpilotConfigWizard.cc \ kpilotConfigWizard.cc \
dbSelectionDialog.cc dbSelection_base.ui 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_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 \ ../lib/libkpilot.la \
libconfiguration.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, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # 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 ../lib/libkpilot.la libconfiguration.la
kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \ kpilotDaemon_LDADD = $(LIB_TDEFILE) $(PISOCK_LIB) \
../lib/libkpilot.la libconfiguration.la ../lib/libkpilot.la libconfiguration.la
kpilotTest_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \ kpilotTest_LDADD = $(LIB_TDEFILE) $(PISOCK_LIB) \
../lib/libkpilot.la libconfiguration.la ../lib/libkpilot.la libconfiguration.la
xdg_apps_DATA = kpilot.desktop kpilotdaemon.desktop xdg_apps_DATA = kpilot.desktop kpilotdaemon.desktop

Write Preview
Loading…
Cancel
Save