From e749433ae3eff9b7bba65f1a07ff104a76da91a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 12 Aug 2012 02:29:41 +0200 Subject: [PATCH] Update autotools for new DSO linkage style Thanks to Francois Andriot for the patch (cherry picked from commit 48da9e7fb21be98b1c0a272f7d23be35325a7209) --- kerry/src/Makefile.am | 2 +- kerry/src/kcm/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kerry/src/Makefile.am b/kerry/src/Makefile.am index cfaa2ed..6e924bf 100644 --- a/kerry/src/Makefile.am +++ b/kerry/src/Makefile.am @@ -28,7 +28,7 @@ kerry_la_SOURCES = main.cpp beaglesearch.cpp kerryapp.cpp searchdlg.cpp searchdl dcopinterface.skel dcopinterface.stub kerrylabel.cpp query.cpp kerry_la_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS) $(LIB_QT) -kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) +kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) -lDCOP $(LIB_QT) $(LIB_KDECORE) autostartdir = $(datadir)/autostart autostart_DATA = kerry.autostart.desktop beagled.desktop diff --git a/kerry/src/kcm/Makefile.am b/kerry/src/kcm/Makefile.am index b841726..73c4c87 100644 --- a/kerry/src/kcm/Makefile.am +++ b/kerry/src/kcm/Makefile.am @@ -9,7 +9,7 @@ kcm_beagle_la_SOURCES = main.cpp beagle.cpp kerry.cpp indexing.cpp backends.cpp select_privacy_resource.ui kcm_beagle_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_beagle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD) +kcm_beagle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD) $(LIB_QT) $(LIB_KDECORE) -lDCOP xdg_apps_DATA = kcmbeagle.desktop