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

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 6eef509431
commit 2c8f340d81
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
conduits/configure.in.in
Unescape View File

@ -170,7 +170,7 @@ dnl
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0 AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0
KDE_CHECK_HEADER(kresources/factory.h,HAVE_KABC=1, KDE_CHECK_HEADER(tderesources/factory.h,HAVE_KABC=1,
AC_MSG_WARN([KPILOT: Older kaddressbook version detected. No address book AC_MSG_WARN([KPILOT: Older kaddressbook version detected. No address book
conduit will be compiled.])) conduit will be compiled.]))
AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1) AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)

2
conduits/docconduit/Makefile.am
Unescape View File

@ -28,7 +28,7 @@ conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
##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) -lktexteditor 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_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la
xdg_apps_DATA = kpalmdoc.desktop xdg_apps_DATA = kpalmdoc.desktop

4
conduits/vcalconduit/Makefile.am
Unescape View File

@ -24,14 +24,14 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
vcal-factory.cc vcal-setup.cc vcal-factory.cc vcal-setup.cc
conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -lkresources conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -ltderesources
conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \ conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
libvcalconduit_shared.la libvcalconduit_shared.la
conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
todo-factory.cc todo-setup.cc todo-factory.cc todo-setup.cc
conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -lkresources conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -ltderesources
conduit_todo_la_LIBADD = ../../lib/libkpilot.la \ conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
libvcalconduit_shared.la libvcalconduit_shared.la
conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h

2
kpilot/CMakeLists.txt
Unescape View File

@ -137,7 +137,7 @@ kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
trinity_automoc(${kpilot_SRCS}) trinity_automoc(${kpilot_SRCS})
add_executable(kpilot_bin ${kpilot_SRCS}) add_executable(kpilot_bin ${kpilot_SRCS})
target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot kutils tdeui kio) target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot tdeutils tdeui kio)
kpilot_rpath(kpilot_bin) kpilot_rpath(kpilot_bin)
set_target_properties(kpilot_bin PROPERTIES set_target_properties(kpilot_bin PROPERTIES
OUTPUT_NAME kpilot OUTPUT_NAME kpilot

12
kpilot/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ METASOURCES = AUTO
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc
libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \
kpilotConfigDialog_device.ui \ kpilotConfigDialog_device.ui \
@ -35,7 +35,7 @@ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \
kpilotConfigWizard_app.ui \ kpilotConfigWizard_app.ui \
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) -lktexteditor -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_KFILE) $(PISOCK_LIB) \
../lib/libkpilot.la \ ../lib/libkpilot.la \
libconfiguration.la libconfiguration.la
@ -68,14 +68,14 @@ kpilotTest_SOURCES = \
main-test.cc main-test.cc
kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kpilotDaemon_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) -ltdetexteditor
kpilotTest_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) -ltdetexteditor
# 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) -lkutils \ kpilot_LDADD = $(LIB_KFILE) $(PISOCK_LIB) -ltdeutils \
../lib/libkpilot.la libconfiguration.la ../lib/libkpilot.la libconfiguration.la
kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \ kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \
../lib/libkpilot.la libconfiguration.la ../lib/libkpilot.la libconfiguration.la

Write Preview
Loading…
Cancel
Save