diff options
27 files changed, 33 insertions, 29 deletions
diff --git a/digikam/imageplugins/adjustcurves/Makefile.am b/digikam/imageplugins/adjustcurves/Makefile.am index 7def6d3e..4b6b0d8f 100644 --- a/digikam/imageplugins/adjustcurves/Makefile.am +++ b/digikam/imageplugins/adjustcurves/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari kde_services_DATA = digikamimageplugin_adjustcurves.desktop -kde_module_LTLIBRARIES = digikamimageplugin_adjustcurves.la +#kde_module_LTLIBRARIES = digikamimageplugin_adjustcurves.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_adjustcurves_ui.rc diff --git a/digikam/imageplugins/adjustlevels/Makefile.am b/digikam/imageplugins/adjustlevels/Makefile.am index bc18f428..1877e011 100644 --- a/digikam/imageplugins/adjustlevels/Makefile.am +++ b/digikam/imageplugins/adjustlevels/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari kde_services_DATA = digikamimageplugin_adjustlevels.desktop -kde_module_LTLIBRARIES = digikamimageplugin_adjustlevels.la +#kde_module_LTLIBRARIES = digikamimageplugin_adjustlevels.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_adjustlevels_ui.rc diff --git a/digikam/imageplugins/antivignetting/Makefile.am b/digikam/imageplugins/antivignetting/Makefile.am index a7a2b76c..9b5141fc 100644 --- a/digikam/imageplugins/antivignetting/Makefile.am +++ b/digikam/imageplugins/antivignetting/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libra kde_services_DATA = digikamimageplugin_antivignetting.desktop -kde_module_LTLIBRARIES = digikamimageplugin_antivignetting.la +#kde_module_LTLIBRARIES = digikamimageplugin_antivignetting.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_antivignetting_ui.rc diff --git a/digikam/imageplugins/blurfx/Makefile.am b/digikam/imageplugins/blurfx/Makefile.am index 7ec1c9dd..2e6e8f4f 100644 --- a/digikam/imageplugins/blurfx/Makefile.am +++ b/digikam/imageplugins/blurfx/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -l kde_services_DATA = digikamimageplugin_blurfx.desktop -kde_module_LTLIBRARIES = digikamimageplugin_blurfx.la +#kde_module_LTLIBRARIES = digikamimageplugin_blurfx.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_blurfx_ui.rc diff --git a/digikam/imageplugins/border/Makefile.am b/digikam/imageplugins/border/Makefile.am index 1edce082..016f0d3c 100644 --- a/digikam/imageplugins/border/Makefile.am +++ b/digikam/imageplugins/border/Makefile.am @@ -28,7 +28,7 @@ digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -l kde_services_DATA = digikamimageplugin_border.desktop -kde_module_LTLIBRARIES = digikamimageplugin_border.la +#kde_module_LTLIBRARIES = digikamimageplugin_border.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_border_ui.rc diff --git a/digikam/imageplugins/channelmixer/Makefile.am b/digikam/imageplugins/channelmixer/Makefile.am index 36362753..4e83cf2a 100644 --- a/digikam/imageplugins/channelmixer/Makefile.am +++ b/digikam/imageplugins/channelmixer/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari kde_services_DATA = digikamimageplugin_channelmixer.desktop -kde_module_LTLIBRARIES = digikamimageplugin_channelmixer.la +#kde_module_LTLIBRARIES = digikamimageplugin_channelmixer.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_channelmixer_ui.rc diff --git a/digikam/imageplugins/charcoal/Makefile.am b/digikam/imageplugins/charcoal/Makefile.am index 0bc8f1c3..d767acb7 100644 --- a/digikam/imageplugins/charcoal/Makefile.am +++ b/digikam/imageplugins/charcoal/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_charcoal.desktop -kde_module_LTLIBRARIES = digikamimageplugin_charcoal.la +#kde_module_LTLIBRARIES = digikamimageplugin_charcoal.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_charcoal_ui.rc diff --git a/digikam/imageplugins/colorfx/Makefile.am b/digikam/imageplugins/colorfx/Makefile.am index 7cd17008..0fe571fe 100644 --- a/digikam/imageplugins/colorfx/Makefile.am +++ b/digikam/imageplugins/colorfx/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - kde_services_DATA = digikamimageplugin_colorfx.desktop -kde_module_LTLIBRARIES = digikamimageplugin_colorfx.la +#kde_module_LTLIBRARIES = digikamimageplugin_colorfx.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_colorfx_ui.rc diff --git a/digikam/imageplugins/coreplugin/Makefile.am b/digikam/imageplugins/coreplugin/Makefile.am index e65580d0..5f367f99 100644 --- a/digikam/imageplugins/coreplugin/Makefile.am +++ b/digikam/imageplugins/coreplugin/Makefile.am @@ -36,13 +36,17 @@ digikamimageplugin_core_la_LIBADD = $(LIB_KPARTS) \ $(top_builddir)/digikam/imageplugins/coreplugin/sharpnesseditor/libsharpnesseditor.la \ $(top_builddir)/digikam/imageplugins/coreplugin/hsl/libhsl.la \ $(top_builddir)/digikam/imageplugins/coreplugin/ratiocrop/libratiocrop.la \ - $(top_builddir)/digikam/digikam/libdigikam.la + $(top_builddir)/digikam/digikam/libdigikam.la \ + $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \ + $(top_builddir)/digikam/libs/curves/libcurves.la \ + $(top_builddir)/digikam/libs/widgets/common/libcommonwidgets.la \ + $(top_builddir)/digikam/libs/widgets/imageplugins/libimagepluginswidgets.la -digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio +digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio -lkexiv2 -lkutils kde_services_DATA = digikamimageplugin_core.desktop -kde_module_LTLIBRARIES = digikamimageplugin_core.la +#kde_module_LTLIBRARIES = digikamimageplugin_core.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_core_ui.rc diff --git a/digikam/imageplugins/distortionfx/Makefile.am b/digikam/imageplugins/distortionfx/Makefile.am index 44330d01..04e348e3 100644 --- a/digikam/imageplugins/distortionfx/Makefile.am +++ b/digikam/imageplugins/distortionfx/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari kde_services_DATA = digikamimageplugin_distortionfx.desktop -kde_module_LTLIBRARIES = digikamimageplugin_distortionfx.la +#kde_module_LTLIBRARIES = digikamimageplugin_distortionfx.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_distortionfx_ui.rc diff --git a/digikam/imageplugins/emboss/Makefile.am b/digikam/imageplugins/emboss/Makefile.am index e5fa12df..44d882f3 100644 --- a/digikam/imageplugins/emboss/Makefile.am +++ b/digikam/imageplugins/emboss/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -l kde_services_DATA = digikamimageplugin_emboss.desktop -kde_module_LTLIBRARIES = digikamimageplugin_emboss.la +#kde_module_LTLIBRARIES = digikamimageplugin_emboss.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_emboss_ui.rc diff --git a/digikam/imageplugins/filmgrain/Makefile.am b/digikam/imageplugins/filmgrain/Makefile.am index efea96c4..ae78cc1c 100644 --- a/digikam/imageplugins/filmgrain/Makefile.am +++ b/digikam/imageplugins/filmgrain/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_filmgrain.desktop -kde_module_LTLIBRARIES = digikamimageplugin_filmgrain.la +#kde_module_LTLIBRARIES = digikamimageplugin_filmgrain.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_filmgrain_ui.rc diff --git a/digikam/imageplugins/freerotation/Makefile.am b/digikam/imageplugins/freerotation/Makefile.am index 6e0a9f58..e20b3b65 100644 --- a/digikam/imageplugins/freerotation/Makefile.am +++ b/digikam/imageplugins/freerotation/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari kde_services_DATA = digikamimageplugin_freerotation.desktop -kde_module_LTLIBRARIES = digikamimageplugin_freerotation.la +#kde_module_LTLIBRARIES = digikamimageplugin_freerotation.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_freerotation_ui.rc diff --git a/digikam/imageplugins/hotpixels/Makefile.am b/digikam/imageplugins/hotpixels/Makefile.am index e468a2c4..ea7e658e 100644 --- a/digikam/imageplugins/hotpixels/Makefile.am +++ b/digikam/imageplugins/hotpixels/Makefile.am @@ -29,7 +29,7 @@ digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_hotpixels.desktop -kde_module_LTLIBRARIES = digikamimageplugin_hotpixels.la +#kde_module_LTLIBRARIES = digikamimageplugin_hotpixels.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_hotpixels_ui.rc diff --git a/digikam/imageplugins/infrared/Makefile.am b/digikam/imageplugins/infrared/Makefile.am index 5c25992c..0c7af9c2 100644 --- a/digikam/imageplugins/infrared/Makefile.am +++ b/digikam/imageplugins/infrared/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_infrared.desktop -kde_module_LTLIBRARIES = digikamimageplugin_infrared.la +#kde_module_LTLIBRARIES = digikamimageplugin_infrared.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_infrared_ui.rc diff --git a/digikam/imageplugins/inpainting/Makefile.am b/digikam/imageplugins/inpainting/Makefile.am index 5dd7dd08..9ae30bb2 100644 --- a/digikam/imageplugins/inpainting/Makefile.am +++ b/digikam/imageplugins/inpainting/Makefile.am @@ -28,7 +28,7 @@ digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries kde_services_DATA = digikamimageplugin_inpainting.desktop -kde_module_LTLIBRARIES = digikamimageplugin_inpainting.la +#kde_module_LTLIBRARIES = digikamimageplugin_inpainting.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_inpainting_ui.rc diff --git a/digikam/imageplugins/inserttext/Makefile.am b/digikam/imageplugins/inserttext/Makefile.am index a4493511..e10134a1 100644 --- a/digikam/imageplugins/inserttext/Makefile.am +++ b/digikam/imageplugins/inserttext/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries kde_services_DATA = digikamimageplugin_inserttext.desktop -kde_module_LTLIBRARIES = digikamimageplugin_inserttext.la +#kde_module_LTLIBRARIES = digikamimageplugin_inserttext.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_inserttext_ui.rc diff --git a/digikam/imageplugins/lensdistortion/Makefile.am b/digikam/imageplugins/lensdistortion/Makefile.am index 546446d0..9fec75bd 100644 --- a/digikam/imageplugins/lensdistortion/Makefile.am +++ b/digikam/imageplugins/lensdistortion/Makefile.am @@ -28,7 +28,7 @@ digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libra kde_services_DATA = digikamimageplugin_lensdistortion.desktop -kde_module_LTLIBRARIES = digikamimageplugin_lensdistortion.la +#kde_module_LTLIBRARIES = digikamimageplugin_lensdistortion.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_lensdistortion_ui.rc diff --git a/digikam/imageplugins/noisereduction/Makefile.am b/digikam/imageplugins/noisereduction/Makefile.am index d3c4366f..9dadc7a7 100644 --- a/digikam/imageplugins/noisereduction/Makefile.am +++ b/digikam/imageplugins/noisereduction/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libra kde_services_DATA = digikamimageplugin_noisereduction.desktop -kde_module_LTLIBRARIES = digikamimageplugin_noisereduction.la +#kde_module_LTLIBRARIES = digikamimageplugin_noisereduction.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_noisereduction_ui.rc diff --git a/digikam/imageplugins/oilpaint/Makefile.am b/digikam/imageplugins/oilpaint/Makefile.am index 502af826..5a5c8621 100644 --- a/digikam/imageplugins/oilpaint/Makefile.am +++ b/digikam/imageplugins/oilpaint/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_oilpaint.desktop -kde_module_LTLIBRARIES = digikamimageplugin_oilpaint.la +#kde_module_LTLIBRARIES = digikamimageplugin_oilpaint.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_oilpaint_ui.rc diff --git a/digikam/imageplugins/perspective/Makefile.am b/digikam/imageplugins/perspective/Makefile.am index 88ebab5b..5264df69 100644 --- a/digikam/imageplugins/perspective/Makefile.am +++ b/digikam/imageplugins/perspective/Makefile.am @@ -28,7 +28,7 @@ digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librarie kde_services_DATA = digikamimageplugin_perspective.desktop -kde_module_LTLIBRARIES = digikamimageplugin_perspective.la +#kde_module_LTLIBRARIES = digikamimageplugin_perspective.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_perspective_ui.rc diff --git a/digikam/imageplugins/raindrop/Makefile.am b/digikam/imageplugins/raindrop/Makefile.am index 010030e4..08bdcb7a 100644 --- a/digikam/imageplugins/raindrop/Makefile.am +++ b/digikam/imageplugins/raindrop/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_raindrop.desktop -kde_module_LTLIBRARIES = digikamimageplugin_raindrop.la +#kde_module_LTLIBRARIES = digikamimageplugin_raindrop.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_raindrop_ui.rc diff --git a/digikam/imageplugins/restoration/Makefile.am b/digikam/imageplugins/restoration/Makefile.am index 9c717806..9b617429 100644 --- a/digikam/imageplugins/restoration/Makefile.am +++ b/digikam/imageplugins/restoration/Makefile.am @@ -28,7 +28,7 @@ digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librarie kde_services_DATA = digikamimageplugin_restoration.desktop -kde_module_LTLIBRARIES = digikamimageplugin_restoration.la +#kde_module_LTLIBRARIES = digikamimageplugin_restoration.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_restoration_ui.rc diff --git a/digikam/imageplugins/sheartool/Makefile.am b/digikam/imageplugins/sheartool/Makefile.am index ee4f5fd4..4fa368d1 100644 --- a/digikam/imageplugins/sheartool/Makefile.am +++ b/digikam/imageplugins/sheartool/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = digikamimageplugin_sheartool.desktop -kde_module_LTLIBRARIES = digikamimageplugin_sheartool.la +#kde_module_LTLIBRARIES = digikamimageplugin_sheartool.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_sheartool_ui.rc diff --git a/digikam/imageplugins/superimpose/Makefile.am b/digikam/imageplugins/superimpose/Makefile.am index 65dac51e..d33dca1b 100644 --- a/digikam/imageplugins/superimpose/Makefile.am +++ b/digikam/imageplugins/superimpose/Makefile.am @@ -29,7 +29,7 @@ digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librarie kde_services_DATA = digikamimageplugin_superimpose.desktop -kde_module_LTLIBRARIES = digikamimageplugin_superimpose.la +#kde_module_LTLIBRARIES = digikamimageplugin_superimpose.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_superimpose_ui.rc diff --git a/digikam/imageplugins/texture/Makefile.am b/digikam/imageplugins/texture/Makefile.am index c199645c..52fab22f 100644 --- a/digikam/imageplugins/texture/Makefile.am +++ b/digikam/imageplugins/texture/Makefile.am @@ -28,7 +28,7 @@ digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - kde_services_DATA = digikamimageplugin_texture.desktop -kde_module_LTLIBRARIES = digikamimageplugin_texture.la +#kde_module_LTLIBRARIES = digikamimageplugin_texture.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_texture_ui.rc diff --git a/digikam/imageplugins/whitebalance/Makefile.am b/digikam/imageplugins/whitebalance/Makefile.am index 8139659f..5a6b830d 100644 --- a/digikam/imageplugins/whitebalance/Makefile.am +++ b/digikam/imageplugins/whitebalance/Makefile.am @@ -27,7 +27,7 @@ digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari kde_services_DATA = digikamimageplugin_whitebalance.desktop -kde_module_LTLIBRARIES = digikamimageplugin_whitebalance.la +#kde_module_LTLIBRARIES = digikamimageplugin_whitebalance.la rcdir = $(kde_datadir)/digikam rc_DATA = digikamimageplugin_whitebalance_ui.rc |