summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-25 17:10:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-25 17:10:56 +0000
commit40fb4d06440009abcbb5731f45e5ea563bf3beb5 (patch)
tree5fb93c4e4886666c452a0a56f1db1746b3e070ad
parentf84d8a2c4e4058c02f219cd81e6588b4a7abbc58 (diff)
downloadkoffice-40fb4d06.tar.gz
koffice-40fb4d06.zip
More automake fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1107444 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--krita/plugins/viewplugins/screenshot/Makefile.am4
-rw-r--r--krita/plugins/viewplugins/scripting/kritacore/Makefile.am3
-rw-r--r--krita/plugins/viewplugins/separate_channels/Makefile.am4
3 files changed, 6 insertions, 5 deletions
diff --git a/krita/plugins/viewplugins/screenshot/Makefile.am b/krita/plugins/viewplugins/screenshot/Makefile.am
index da245c22e..f05e31547 100644
--- a/krita/plugins/viewplugins/screenshot/Makefile.am
+++ b/krita/plugins/viewplugins/screenshot/Makefile.am
@@ -15,8 +15,8 @@ kde_module_LTLIBRARIES = kritascreenshot.la
kritascreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui
noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h
-kritascreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kritablurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
- -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficeui/.libs -lkofficeui
+kritascreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+ -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficeui/.libs -lkofficeui -lkdeprint
kritascreenshot_la_LIBADD = ../../../libkritacommon.la
kde_services_DATA = kritascreenshot.desktop
diff --git a/krita/plugins/viewplugins/scripting/kritacore/Makefile.am b/krita/plugins/viewplugins/scripting/kritacore/Makefile.am
index e948f6475..5a19001d1 100644
--- a/krita/plugins/viewplugins/scripting/kritacore/Makefile.am
+++ b/krita/plugins/viewplugins/scripting/kritacore/Makefile.am
@@ -11,7 +11,8 @@ krosskritacore_la_SOURCES = kritacoremodule.cpp krs_doc.cpp krs_paint_layer.cpp
krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \
krs_wavelet.cpp
-krosskritacore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+krosskritacore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../../krita/kritacolor/.libs -lkritacolor -L../../../../../krita/core/.libs -lkritaimage \
+ -L../../../../../krita/ui/.libs -lkritaui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore
krosskritacore_la_LIBADD = \
$(LIB_QT) \
$(LIB_KDECORE) \
diff --git a/krita/plugins/viewplugins/separate_channels/Makefile.am b/krita/plugins/viewplugins/separate_channels/Makefile.am
index a147c9b7c..364527373 100644
--- a/krita/plugins/viewplugins/separate_channels/Makefile.am
+++ b/krita/plugins/viewplugins/separate_channels/Makefile.am
@@ -20,8 +20,8 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \
kde_services_DATA = kritaseparatechannels.desktop
-kritaseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kritablurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
- -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficeui/.libs -lkofficeui
+kritaseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+ -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficeui/.libs -lkofficeui -L../../../../lib/kofficecore/.libs -lkofficecore
kritaseparatechannels_la_LIBADD = ../../../libkritacommon.la
kritaseparatechannels_la_METASOURCES = AUTO