summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
commit57ea538121391a73a72fd236489e34e09a5c8ee7 (patch)
tree4884d6f6e1a7e1c875be4fc85caa569084a7ebc8 /kjsembed
parent766f87fcc9a8f9e6ea6ce01821479c5cb6fe1bff (diff)
downloadtdebindings-57ea538121391a73a72fd236489e34e09a5c8ee7.tar.gz
tdebindings-57ea538121391a73a72fd236489e34e09a5c8ee7.zip
Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/builtins/Makefile.am2
-rw-r--r--kjsembed/docs/embedding/simple-embed/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am
index d1b1ade9..0dd2516b 100644
--- a/kjsembed/builtins/Makefile.am
+++ b/kjsembed/builtins/Makefile.am
@@ -11,7 +11,7 @@ libkjsembedbuiltins_la_SOURCES = stdaction_imp.cpp \
qdir_imp.cpp \
qfile_imp.cpp
-libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
$(LIB_KFILE) -lkjs $(LIBSOCKET)
diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am
index 44607f91..b3f7afe7 100644
--- a/kjsembed/docs/embedding/simple-embed/Makefile.am
+++ b/kjsembed/docs/embedding/simple-embed/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs
INCLUDES = -I$(top_srcdir) $(all_includes)
# the library search path.
-embedjs_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# the libraries to link against.
embedjs_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la