From a4ca9ecc41967c15180a1edb2b420cae56306b92 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 16 Jan 2010 22:09:03 +0000 Subject: Repair FTBFS due to missing linker flags git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1075856 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- dcopjava/binding/Makefile.am | 2 +- kjsembed/kscript/Makefile.am | 2 +- kjsembed/plugin/Makefile.am | 2 +- kjsembed/plugins/Makefile.am | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index 3e919043..fdb01a9d 100644 --- a/dcopjava/binding/Makefile.am +++ b/dcopjava/binding/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES = libjavadcop.la libjavadcop_la_SOURCES = client.cpp -libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) +libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx libjavadcop_la_LIBADD = $(LIB_KDECORE) INCLUDES = $(jni_includes) $(all_includes) diff --git a/kjsembed/kscript/Makefile.am b/kjsembed/kscript/Makefile.am index 2e3a6915..f96195df 100644 --- a/kjsembed/kscript/Makefile.am +++ b/kjsembed/kscript/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libjavascript.la libjavascript_la_SOURCES = javascript.cpp -libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version +libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -no-undefined -avoid-version libjavascript_la_LIBADD = -lkscript ../libkjsembed.la diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am index 9ec99770..0c36bf20 100644 --- a/kjsembed/plugin/Makefile.am +++ b/kjsembed/plugin/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libjsconsoleplugin.la METASOURCES = AUTO libjsconsoleplugin_la_SOURCES = jsconsoleplugin.cpp -libjsconsoleplugin_la_LIBADD = $(LIB_KPARTS) ../libkjsembed.la +libjsconsoleplugin_la_LIBADD = -lDCOP -lkdecore -lkdeui -lkjs $(LIB_QT) $(LIB_KPARTS) ../libkjsembed.la libjsconsoleplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) #pluginsdir = $(kde_datadir)/konqueror/kpartplugins diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index ff2d954a..ee697f4a 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -7,27 +7,27 @@ METASOURCES = AUTO # the Plugin's source, library search path, and link libraries libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp -libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) +libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries) libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp -libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) +libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries) libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libimagefxplugin_la_SOURCES = imagefx_plugin.cpp -libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) +libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries) libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libqprocessplugin_la_SOURCES = qprocess_plugin.cpp -libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) +libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries) libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libfileitemplugin_la_SOURCES = kfileitemloader.cpp -libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(all_libraries) libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la @@ -35,4 +35,3 @@ libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la plugindesktopdir = $(kde_servicesdir) plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop - -- cgit v1.2.3