summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-14 03:23:23 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-14 03:23:23 +0000
commit093e82397d695b5db4b879eac464f4c6ffa226c0 (patch)
tree9c1ba8ad8df1d01b19b0f602635be33c5d5fd7f1
parent12f5437f195d09e81b7ba1736a173d58e8b1f503 (diff)
downloadbasket-093e8239.tar.gz
basket-093e8239.zip
Fix basket FTBFS under oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1258873 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 40e5b0c..9c2fd75 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ lib_LTLIBRARIES = libbasketcommon.la
AM_CPPFLAGS = $(GPGME_CFLAGS)
-libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
+libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -lkdecore -lDCOP -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -lkio $(LIB_KDEUI) $(LIB_KDECORE) \
$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_KPARTS) -lDCOP -lkdefx -lkdeui -lkdecore $(LIB_QT) -lkdefx -ldl -lartsc
@@ -55,7 +55,7 @@ libbasketcommon_la_SOURCES = \
bin_PROGRAMS = basket
# the application source, library search path, and link libraries
-basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KUTILS) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
+basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KUTILS) -lkdecore -lDCOP -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
basket_LDADD = libbasketcommon.la
# this is where the desktop file will go
@@ -81,12 +81,12 @@ kde_icon_KDEICON = cr128-app-basket.png cr16-app-basket.png cr22-app-basket.png
kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
libbasketpart_la_SOURCES = basket_part.cpp
-libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
+libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lDCOP -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
libbasketpart_la_LIBADD = libbasketcommon.la -lkparts -lkdeui $(LIB_KDECORE) $(LIB_QT) -lDCOP
kcm_basket_la_SOURCES = kcm_basket.cpp
-kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde
-kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_KDECORE) $(LIB_QT) -lkdeui
+kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lDCOP -lkjs -lkdefx -ldl -lartsc -lartskde
+kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_KDECORE) $(LIB_QT) -lkdeui -lDCOP
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)