From f84d8a2c4e4058c02f219cd81e6588b4a7abbc58 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 25 Mar 2010 06:36:14 +0000 Subject: [PATCH] More automake fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1107250 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krita/plugins/viewplugins/colorrange/Makefile.am | 3 ++- krita/plugins/viewplugins/colorspaceconversion/Makefile.am | 3 ++- krita/plugins/viewplugins/dropshadow/Makefile.am | 3 ++- krita/plugins/viewplugins/filtersgallery/Makefile.am | 3 ++- krita/plugins/viewplugins/histogram/Makefile.am | 3 ++- krita/plugins/viewplugins/histogram_docker/Makefile.am | 3 ++- krita/plugins/viewplugins/imagesize/Makefile.am | 3 ++- krita/plugins/viewplugins/modify_selection/Makefile.am | 3 ++- krita/plugins/viewplugins/performancetest/Makefile.am | 3 ++- krita/plugins/viewplugins/rotateimage/Makefile.am | 3 ++- krita/plugins/viewplugins/screenshot/Makefile.am | 3 ++- krita/plugins/viewplugins/scripting/Makefile.am | 3 ++- krita/plugins/viewplugins/selectopaque/Makefile.am | 3 ++- krita/plugins/viewplugins/separate_channels/Makefile.am | 3 ++- krita/plugins/viewplugins/shearimage/Makefile.am | 3 ++- krita/plugins/viewplugins/substrate/Makefile.am | 3 ++- krita/plugins/viewplugins/variations/Makefile.am | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/krita/plugins/viewplugins/colorrange/Makefile.am b/krita/plugins/viewplugins/colorrange/Makefile.am index 90a260a3e..9d07e0112 100644 --- a/krita/plugins/viewplugins/colorrange/Makefile.am +++ b/krita/plugins/viewplugins/colorrange/Makefile.am @@ -11,7 +11,8 @@ kritacolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h kritacolorrange_la_LIBADD = ../../../libkritacommon.la -kritacolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritacolorrange_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 kritarcdir = $(kde_datadir)/kritaplugins kritarc_DATA = colorrange.rc diff --git a/krita/plugins/viewplugins/colorspaceconversion/Makefile.am b/krita/plugins/viewplugins/colorspaceconversion/Makefile.am index a3f9bd936..b46dc87a6 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/Makefile.am +++ b/krita/plugins/viewplugins/colorspaceconversion/Makefile.am @@ -17,7 +17,8 @@ kde_module_LTLIBRARIES = kritacolorspaceconversion.la kritacolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h -kritacolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritacolorspaceconversion_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 kritacolorspaceconversion_la_LIBADD = ../../../libkritacommon.la kritacolorspaceconversion_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/dropshadow/Makefile.am b/krita/plugins/viewplugins/dropshadow/Makefile.am index c339627ec..97d66c48a 100644 --- a/krita/plugins/viewplugins/dropshadow/Makefile.am +++ b/krita/plugins/viewplugins/dropshadow/Makefile.am @@ -20,7 +20,8 @@ kritadropshadow_la_SOURCES = wdg_dropshadow.ui \ noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \ kis_dropshadow.h dlg_dropshadow.h -kritadropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritadropshadow_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 kritadropshadow_la_LIBADD = ../../../libkritacommon.la ../../../colorspaces/rgb_u8/libkritargb.la kde_services_DATA = kritadropshadow.desktop diff --git a/krita/plugins/viewplugins/filtersgallery/Makefile.am b/krita/plugins/viewplugins/filtersgallery/Makefile.am index 5c463f96f..74fa32067 100644 --- a/krita/plugins/viewplugins/filtersgallery/Makefile.am +++ b/krita/plugins/viewplugins/filtersgallery/Makefile.am @@ -19,7 +19,8 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h kde_services_DATA = kritafiltersgallery.desktop -kritafiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritafiltersgallery_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 kritafiltersgallery_la_LIBADD = ../../../libkritacommon.la kritafiltersgallery_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/histogram/Makefile.am b/krita/plugins/viewplugins/histogram/Makefile.am index a8dd17a17..d32174ed9 100644 --- a/krita/plugins/viewplugins/histogram/Makefile.am +++ b/krita/plugins/viewplugins/histogram/Makefile.am @@ -18,7 +18,8 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget kde_services_DATA = kritahistogram.desktop -kritahistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritahistogram_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 kritahistogram_la_LIBADD = ../../../libkritacommon.la kritahistogram_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/histogram_docker/Makefile.am b/krita/plugins/viewplugins/histogram_docker/Makefile.am index 6d1163583..bbcdd8bb5 100644 --- a/krita/plugins/viewplugins/histogram_docker/Makefile.am +++ b/krita/plugins/viewplugins/histogram_docker/Makefile.am @@ -15,7 +15,8 @@ kritahistogramdocker_la_SOURCES = histogramdocker.cc kis_imagerasteredcache.cc kde_module_LTLIBRARIES = kritahistogramdocker.la noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h -kritahistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritahistogramdocker_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 kritahistogramdocker_la_LIBADD = ../../../libkritacommon.la kritahistogramdocker_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/imagesize/Makefile.am b/krita/plugins/viewplugins/imagesize/Makefile.am index 12cd96bbb..5e78e3d4d 100644 --- a/krita/plugins/viewplugins/imagesize/Makefile.am +++ b/krita/plugins/viewplugins/imagesize/Makefile.am @@ -18,7 +18,8 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h kde_module_LTLIBRARIES = kritaimagesize.la -kritaimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritaimagesize_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 kritaimagesize_la_LIBADD = ../../../libkritacommon.la kritaimagesize_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/modify_selection/Makefile.am b/krita/plugins/viewplugins/modify_selection/Makefile.am index f70b7cf24..7b30de229 100644 --- a/krita/plugins/viewplugins/modify_selection/Makefile.am +++ b/krita/plugins/viewplugins/modify_selection/Makefile.am @@ -20,7 +20,8 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h kde_module_LTLIBRARIES = kritamodifyselection.la -kritamodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritamodifyselection_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 kritamodifyselection_la_LIBADD = ../../../libkritacommon.la kritamodifyselection_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/performancetest/Makefile.am b/krita/plugins/viewplugins/performancetest/Makefile.am index bcbd2d186..fd1e77355 100644 --- a/krita/plugins/viewplugins/performancetest/Makefile.am +++ b/krita/plugins/viewplugins/performancetest/Makefile.am @@ -16,7 +16,8 @@ kde_module_LTLIBRARIES = kritaperftest.la kritaperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h -kritaperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritaperftest_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 kritaperftest_la_LIBADD = ../../../libkritacommon.la kde_services_DATA = kritaperftest.desktop diff --git a/krita/plugins/viewplugins/rotateimage/Makefile.am b/krita/plugins/viewplugins/rotateimage/Makefile.am index 55546f31e..13eabd805 100644 --- a/krita/plugins/viewplugins/rotateimage/Makefile.am +++ b/krita/plugins/viewplugins/rotateimage/Makefile.am @@ -16,7 +16,8 @@ kde_module_LTLIBRARIES = kritarotateimage.la kritarotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h -kritarotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritarotateimage_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 kritarotateimage_la_LIBADD = ../../../libkritacommon.la kde_services_DATA = kritarotateimage.desktop diff --git a/krita/plugins/viewplugins/screenshot/Makefile.am b/krita/plugins/viewplugins/screenshot/Makefile.am index 616ebdcd6..da245c22e 100644 --- a/krita/plugins/viewplugins/screenshot/Makefile.am +++ b/krita/plugins/viewplugins/screenshot/Makefile.am @@ -15,7 +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) +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_LIBADD = ../../../libkritacommon.la kde_services_DATA = kritascreenshot.desktop diff --git a/krita/plugins/viewplugins/scripting/Makefile.am b/krita/plugins/viewplugins/scripting/Makefile.am index f361a6ce7..b98960be2 100644 --- a/krita/plugins/viewplugins/scripting/Makefile.am +++ b/krita/plugins/viewplugins/scripting/Makefile.am @@ -20,7 +20,8 @@ kritascripting_la_SOURCES = scripting.cc kde_module_LTLIBRARIES = kritascripting.la noinst_HEADERS = scripting.h -kritascripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritascripting_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 kritascripting_la_LIBADD = $(top_builddir)/krita/libkritacommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./kritascripting/libkritascripting.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/krita/plugins/viewplugins/selectopaque/Makefile.am b/krita/plugins/viewplugins/selectopaque/Makefile.am index 2c382ce32..a12339bcc 100644 --- a/krita/plugins/viewplugins/selectopaque/Makefile.am +++ b/krita/plugins/viewplugins/selectopaque/Makefile.am @@ -11,7 +11,8 @@ kritaselectopaque_la_SOURCES = selectopaque.cc noinst_HEADERS = selectopaque.h kritaselectopaque_la_LIBADD = ../../../libkritacommon.la -kritaselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritaselectopaque_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 kritarcdir = $(kde_datadir)/kritaplugins kritarc_DATA = selectopaque.rc diff --git a/krita/plugins/viewplugins/separate_channels/Makefile.am b/krita/plugins/viewplugins/separate_channels/Makefile.am index 238e41844..a147c9b7c 100644 --- a/krita/plugins/viewplugins/separate_channels/Makefile.am +++ b/krita/plugins/viewplugins/separate_channels/Makefile.am @@ -20,7 +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) +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_LIBADD = ../../../libkritacommon.la kritaseparatechannels_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/shearimage/Makefile.am b/krita/plugins/viewplugins/shearimage/Makefile.am index 3c085d45c..18a23d24e 100644 --- a/krita/plugins/viewplugins/shearimage/Makefile.am +++ b/krita/plugins/viewplugins/shearimage/Makefile.am @@ -18,7 +18,8 @@ kde_services_DATA = kritashearimage.desktop kritashearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h -kritashearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritashearimage_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 kritashearimage_la_LIBADD = ../../../libkritacommon.la kritashearimage_la_METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/substrate/Makefile.am b/krita/plugins/viewplugins/substrate/Makefile.am index 5f86ea991..01927b918 100644 --- a/krita/plugins/viewplugins/substrate/Makefile.am +++ b/krita/plugins/viewplugins/substrate/Makefile.am @@ -17,7 +17,8 @@ kde_module_LTLIBRARIES = kritasubstrate.la kritasubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h -kritasubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritasubstrate_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 kritasubstrate_la_LIBADD = ../../../libkritacommon.la kde_services_DATA = kritasubstrate.desktop diff --git a/krita/plugins/viewplugins/variations/Makefile.am b/krita/plugins/viewplugins/variations/Makefile.am index d4908aa63..96c3a8b77 100644 --- a/krita/plugins/viewplugins/variations/Makefile.am +++ b/krita/plugins/viewplugins/variations/Makefile.am @@ -17,7 +17,8 @@ kde_module_LTLIBRARIES = kritavariations.la kritavariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui noinst_HEADERS = wdg_variations.h -kritavariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kritavariations_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 kritavariations_la_LIBADD = ../../../libkritacommon.la kde_services_DATA = kritavariations.desktop