diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:11:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:11:50 -0600 |
| commit | 2c8f340d818cfcf04565422487d3df6b3da89b59 (patch) | |
| tree | 65b6828bace2360819c5695c67bf3bbd1deee617 /conduits | |
| parent | 6eef509431d58c353bf985a3c9faf944915f9446 (diff) | |
| download | kpilot-2c8f340d818cfcf04565422487d3df6b3da89b59.tar.gz kpilot-2c8f340d818cfcf04565422487d3df6b3da89b59.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'conduits')
| -rw-r--r-- | conduits/configure.in.in | 2 | ||||
| -rw-r--r-- | conduits/docconduit/Makefile.am | 2 | ||||
| -rw-r--r-- | conduits/vcalconduit/Makefile.am | 4 |
3 files changed, 4 insertions, 4 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 |