summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/viewplugins/scripting
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/plugins/viewplugins/scripting')
-rw-r--r--chalk/plugins/viewplugins/scripting/Makefile.am8
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am9
2 files changed, 11 insertions, 6 deletions
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
index eec36972..5757c06d 100644
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@@ -20,9 +20,11 @@ chalkscripting_la_SOURCES = scripting.cc
kde_module_LTLIBRARIES = chalkscripting.la
noinst_HEADERS = scripting.h
-chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la
+chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \
+ ../../../../chalk/chalkcolor/libchalkcolor.la \
+ ../../../../chalk/core/libchalkimage.la \
+ ../../../../chalk/ui/libchalkui.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
index ac4a959b..e3eee892 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
@@ -11,15 +11,18 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp
krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \
krs_wavelet.cpp
-krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../../chalk/core/.libs -lchalkimage \
- -L../../../../../chalk/ui/.libs -lchalkui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore
+krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
krosschalkcore_la_LIBADD = \
+ $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \
$(LIB_QT) \
$(LIB_TDECORE) \
$(top_builddir)/lib/kross/api/libkrossapi.la \
$(top_builddir)/lib/kross/main/libkrossmain.la \
$(top_builddir)/chalk/libchalkcommon.la \
- $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la
+ $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \
+ ../../../../../chalk/chalkcolor/libchalkcolor.la \
+ ../../../../../chalk/core/libchalkimage.la \
+ ../../../../../chalk/ui/libchalkui.la
METASOURCES = AUTO
SUBDIRS = .