summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:11:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:11:50 -0600
commit2c8f340d818cfcf04565422487d3df6b3da89b59 (patch)
tree65b6828bace2360819c5695c67bf3bbd1deee617 /conduits/docconduit
parent6eef509431d58c353bf985a3c9faf944915f9446 (diff)
downloadkpilot-2c8f340d818cfcf04565422487d3df6b3da89b59.tar.gz
kpilot-2c8f340d818cfcf04565422487d3df6b3da89b59.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'conduits/docconduit')
-rw-r--r--conduits/docconduit/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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