summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 17:57:59 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 17:57:59 +0000
commitb6bf0b1151892d0defc5e9e94ccc442b58a6f810 (patch)
tree8769b073bf3c588a0f7329a364d85278812e2308
parent57ea538121391a73a72fd236489e34e09a5c8ee7 (diff)
downloadtdebindings-b6bf0b1151892d0defc5e9e94ccc442b58a6f810.tar.gz
tdebindings-b6bf0b1151892d0defc5e9e94ccc442b58a6f810.zip
Fix FTBFS under Ubuntu Oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1258420 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kjsembed/Makefile.am4
-rw-r--r--kjsembed/cpptests/jsaccess/Makefile.am2
2 files changed, 3 insertions, 3 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index d64849c6..a3bdb3bc 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -48,7 +48,7 @@ kjsembedinclude_HEADERS = jsconsolewidget.h \
jsbindingplugin.h \
global.h
-libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH)
+libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KJS)
libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
builtins/libkjsembedbuiltins.la \
@@ -58,7 +58,7 @@ libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
$(LIB_KFILE) $(LIB_KHTML) -lkjs $(LIBSOCKET)
kjscmd_SOURCES = kjscmd.cpp
-kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KJS)
kjscmd_LDADD = libkjsembed.la
man_MANS = kjscmd.1
diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am
index 175344b1..1d3a1a66 100644
--- a/kjsembed/cpptests/jsaccess/Makefile.am
+++ b/kjsembed/cpptests/jsaccess/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
noinst_PROGRAMS = jsaccess
jsaccess_SOURCES = jsaccess.cpp
-jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KJS)
jsaccess_LDADD = $(top_builddir)/kjsembed/libkjsembed.la
METASOURCES = AUTO