diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-16 20:07:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-16 20:07:32 +0000 |
| commit | 48b42e21e071397fbabc465efb07a4a25b8c870b (patch) | |
| tree | 8393d45c22be697551bc230ec2c261be1de1af91 /conduits | |
| parent | e36289e71dd562df11408ad8eff6bf14b587e68f (diff) | |
| download | kpilot-48b42e21e071397fbabc465efb07a4a25b8c870b.tar.gz kpilot-48b42e21e071397fbabc465efb07a4a25b8c870b.zip | |
Fix kpilot FTBFS under oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1259238 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'conduits')
| -rw-r--r-- | conduits/docconduit/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index 03b83ad..de90467 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -17,17 +17,19 @@ kde_module_LTLIBRARIES = conduit_doc.la bin_PROGRAMS = kpalmdoc libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc +libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) +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_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ - $(LIB_KDEUI) $(LIB_KFILE) + $(LIB_KDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ##libpalmdoc_shared.la kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp -kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) -kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la +kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la xdg_apps_DATA = kpalmdoc.desktop servicetypedir = $(kde_servicetypesdir) |