From 2c8f340d818cfcf04565422487d3df6b3da89b59 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:11:50 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- conduits/configure.in.in | 2 +- conduits/docconduit/Makefile.am | 2 +- conduits/vcalconduit/Makefile.am | 4 ++-- kpilot/CMakeLists.txt | 2 +- kpilot/Makefile.am | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conduits/configure.in.in b/conduits/configure.in.in index d1525ee..dcf63fe 100644 --- a/conduits/configure.in.in +++ b/conduits/configure.in.in @@ -170,7 +170,7 @@ dnl dnl ---------------------------------------------------------------------------- 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 conduit will be compiled.])) AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1) diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index 8302d5a..b0d56b0 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -28,7 +28,7 @@ conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ ##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) -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 xdg_apps_DATA = kpalmdoc.desktop diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am index 87c8c3e..0114bc8 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 -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 \ 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 -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 \ libvcalconduit_shared.la conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt index b64378d..9934d04 100644 --- a/kpilot/CMakeLists.txt +++ b/kpilot/CMakeLists.txt @@ -137,7 +137,7 @@ kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h) kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) trinity_automoc(${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) set_target_properties(kpilot_bin PROPERTIES OUTPUT_NAME kpilot diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am index ef4caa7..9425369 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_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 \ 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_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) \ ../lib/libkpilot.la \ libconfiguration.la @@ -68,14 +68,14 @@ kpilotTest_SOURCES = \ main-test.cc -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 +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) -ltdetexteditor +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, # 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 kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la libconfiguration.la