[gimp/gtk3-port] SQUASH into 1d0850df1d23805a051e82f9ee0cac951b82ab32



commit 2de9db6713584abe77d6f69039bce61047601b54
Author: Jehan <jehan girinstud io>
Date:   Sun May 13 03:43:49 2018 +0200

    SQUASH into 1d0850df1d23805a051e82f9ee0cac951b82ab32

 configure.ac                  |   22 +-
 plug-ins/common/Makefile.am   |  700 +++++++++++++++++++++++------------------
 plug-ins/common/gimprc.common |  184 ++++++------
 plug-ins/common/mkgen.pl      |   35 +--
 4 files changed, 514 insertions(+), 427 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2bee825..3096011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1472,7 +1472,7 @@ if test "x$with_gs" != xno; then
   have_gs=yes
   AC_CHECK_LIB(gs, gsapi_new_instance,
     [AC_CHECK_HEADER(ghostscript/iapi.h,
-      FILE_PS='file-ps/file-ps$(EXEEXT)'; GS_LIBS='-lgs',
+      FILE_PS='file-ps$(EXEEXT)'; GS_LIBS='-lgs',
       [have_gs="no (Ghostscript header files not found)"])],
     [have_gs="no (Ghostscript library not found)"])
   if test "x$have_gs" != xyes -a "x$with_gs" = xyes; then
@@ -1516,7 +1516,7 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS" &&
     [have_libmng="no (MNG library not found)"], -lz -lm)
   if test "$mng_ok" = yes; then
     have_libmng=yes
-    FILE_MNG='file-mng/file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"; MNG_CFLAGS="$PNG_CFLAGS"
+    FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"; MNG_CFLAGS="$PNG_CFLAGS"
     if test "x$platform_win32" = "xyes"; then
       MNG_CFLAGS="$MNG_CFLAGS -DMNG_USE_DLL"
     fi
@@ -1541,7 +1541,7 @@ if test "x$with_aa" != xno && test -z "$AA_LIBS"; then
   have_libaa=yes
   AC_CHECK_LIB(aa, aa_printf,
     [AC_CHECK_HEADER(aalib.h,
-      FILE_AA='file-aa/file-aa$(EXEEXT)'; AA_LIBS='-laa',
+      FILE_AA='file-aa$(EXEEXT)'; AA_LIBS='-laa',
       [have_libaa="no (AA header file not found)"])],
     [have_libaa="no (AA library not found)"])
 fi
@@ -1568,7 +1568,7 @@ if test "x$with_libxpm" != xno && test -z "$XPM_LIBS"; then
   have_libxpm=yes
   AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
     [AC_CHECK_HEADER(X11/xpm.h,
-      FILE_XPM='file-xpm/file-xpm$(EXEEXT)'; XPM_LIBS="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
+      FILE_XPM='file-xpm$(EXEEXT)'; XPM_LIBS="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
       [have_libxpm="no (XPM header file not found)"])],
     [have_libxpm="no (XPM library not found)"], $X_PRE_LIBS $lib_X11)
 fi
@@ -1646,7 +1646,7 @@ have_libheif=no
 if test "x$with_libheif" != xno; then
   have_libheif=yes
   PKG_CHECK_MODULES(LIBHEIF, libheif >= libheif_required_version,
-    FILE_HEIF='file-heif/file-heif$(EXEEXT)',
+    FILE_HEIF='file-heif$(EXEEXT)',
     [have_libheif="no (libheif not found)"])
 fi
 
@@ -1696,7 +1696,7 @@ AC_ARG_WITH(webkit, [  --without-webkit        don't build the help-browser and
 have_webkit=no
 if test "x$with_webkit" != xno; then
   PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0 >= webkitgtk_required_version,
-    WEB_PAGE='web-page/web-page$(EXEEXT)'
+    WEB_PAGE='web-page$(EXEEXT)'
     have_webkit=yes,
     have_webkit="no (WebKit not found)")
 else
@@ -1760,7 +1760,7 @@ have_cairo_pdf=no
 if test "x$with_cairo_pdf" != xno; then
   have_cairo_pdf=yes
   PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf >= cairo_pdf_required_version,
-    FILE_PDF_SAVE='file-pdf-save/file-pdf-save$(EXEEXT)',
+    FILE_PDF_SAVE='file-pdf-save$(EXEEXT)',
     have_cairo_pdf="no (cairo-pdf not found)")
 else
    have_cairo_pdf="no (cairo-pdf support disabled)"
@@ -1784,7 +1784,7 @@ if test "x$with_wmf" != xno; then
     wmf_version=`$WMF_CONFIG --version`
     if expr $wmf_version \>= wmf_required_version >/dev/null; then
       AC_MSG_RESULT([yes (version $wmf_version)])
-      FILE_WMF='file-wmf/file-wmf$(EXEEXT)'
+      FILE_WMF='file-wmf$(EXEEXT)'
       WMF_LIBS=`$WMF_CONFIG --libs`
       WMF_CFLAGS=`$WMF_CONFIG --cflags`
     else
@@ -1814,7 +1814,7 @@ have_openjpeg=no
 if test "x$with_jpeg2000" != xno; then
   have_openjpeg=yes
   PKG_CHECK_MODULES(OPENJPEG, libopenjp2 >= openjpeg_required_version,
-    FILE_JP2_LOAD='file-jp2-load/file-jp2-load$(EXEEXT)'
+    FILE_JP2_LOAD='file-jp2-load$(EXEEXT)'
     have_openjpeg=yes,
     have_openjpeg="no (OpenJPEG not found)")
 fi
@@ -1845,7 +1845,7 @@ have_xmc=no
 if test "x$with_xmc" != xno; then
   have_xmc=yes
   PKG_CHECK_MODULES(XMC, xcursor,
-    FILE_XMC='file-xmc/file-xmc$(EXEEXT)',
+    FILE_XMC='file-xmc$(EXEEXT)',
     have_xmc="no (libXcursor not found)")
 else
    have_xmc="no (libXcursor support disabled)"
@@ -2096,7 +2096,7 @@ AM_CONDITIONAL(BUILD_SCRIPT_FU, test "x$with_script_fu" != "xno")
 ###########################################################
 
 if test "x$os_win32" = xno; then
-  MAIL='mail/mail$(EXEEXT)'
+  MAIL='mail$(EXEEXT)'
 fi
 
 AC_SUBST(MAIL)
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 0d1901a..eccf0e9 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -7,8 +7,6 @@
 ## Modify those two files instead of this one; for most
 ## plug-ins you should only need to modify plugin-defs.pl.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 if OS_WIN32
 mwindows = -mwindows
 else
@@ -37,8 +35,6 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
-
 EXTRA_DIST = \
        mkgen.pl        \
        plugin-defs.pl  \
@@ -50,112 +46,206 @@ AM_CPPFLAGS = \
        $(GEGL_CFLAGS)  \
        -I$(includedir)
 
-nobase_libexec_PROGRAMS = \
-       align-layers/align-layers \
-       animation-optimize/animation-optimize \
-##     animation-play/animation-play \
-       blinds/blinds \
-       blur/blur \
-       border-average/border-average \
-       cartoon/cartoon \
-       checkerboard/checkerboard \
-       cml-explorer/cml-explorer \
-       color-cube-analyze/color-cube-analyze \
-       colorify/colorify \
-       colormap-remap/colormap-remap \
-       compose/compose \
-       contrast-normalize/contrast-normalize \
-       contrast-retinex/contrast-retinex \
-       crop-zealous/crop-zealous \
-##     curve-bend/curve-bend \
-       decompose/decompose \
-       depth-merge/depth-merge \
-       despeckle/despeckle \
-       destripe/destripe \
-       edge-dog/edge-dog \
-       edge-neon/edge-neon \
-       emboss/emboss \
-       $(FILE_AA) \
-       file-cel/file-cel \
-       file-compressor/file-compressor \
-       file-csource/file-csource \
-       file-desktop-link/file-desktop-link \
-       file-dicom/file-dicom \
-       file-gbr/file-gbr \
-       file-gegl/file-gegl \
-       file-gif-load/file-gif-load \
-       file-gif-save/file-gif-save \
-       file-gih/file-gih \
-       file-glob/file-glob \
-       file-header/file-header \
-       $(FILE_HEIF) \
-       file-html-table/file-html-table \
-       $(FILE_JP2_LOAD) \
-       $(FILE_MNG) \
-       file-pat/file-pat \
-       file-pcx/file-pcx \
-       file-pdf-load/file-pdf-load \
-       $(FILE_PDF_SAVE) \
-       file-pix/file-pix \
-       file-png/file-png \
-       file-pnm/file-pnm \
-       $(FILE_PS) \
-       file-psp/file-psp \
-       file-raw-data/file-raw-data \
-       file-sunras/file-sunras \
-       file-svg/file-svg \
-       file-tga/file-tga \
-       $(FILE_WMF) \
-       file-xbm/file-xbm \
-       $(FILE_XMC) \
-       $(FILE_XPM) \
-       file-xwd/file-xwd \
-       film/film \
-       filter-pack/filter-pack \
-       fractal-trace/fractal-trace \
-       goat-exercise/goat-exercise \
-       gradient-map/gradient-map \
-       grid/grid \
-       guillotine/guillotine \
-       hot/hot \
-       jigsaw/jigsaw \
-       $(MAIL) \
-       max-rgb/max-rgb \
-       newsprint/newsprint \
-       nl-filter/nl-filter \
-       oilify/oilify \
-       photocopy/photocopy \
-       plugin-browser/plugin-browser \
-       procedure-browser/procedure-browser \
-       qbist/qbist \
-       sample-colorize/sample-colorize \
-       sharpen/sharpen \
-       smooth-palette/smooth-palette \
-       softglow/softglow \
-       sparkle/sparkle \
-       sphere-designer/sphere-designer \
-       tile/tile \
-       tile-small/tile-small \
-       unit-editor/unit-editor \
-       unsharp-mask/unsharp-mask \
-       van-gogh-lic/van-gogh-lic \
-       warp/warp \
-       wavelet-decompose/wavelet-decompose \
-       web-browser/web-browser \
-       $(WEB_PAGE)
+align_layers_libexecdir = $(gimpplugindir)/plug-ins/align-layers
+animation_optimize_libexecdir = $(gimpplugindir)/plug-ins/animation-optimize
+#animation_play_libexecdir = $(gimpplugindir)/plug-ins/animation-play
+blinds_libexecdir = $(gimpplugindir)/plug-ins/blinds
+blur_libexecdir = $(gimpplugindir)/plug-ins/blur
+border_average_libexecdir = $(gimpplugindir)/plug-ins/border-average
+cartoon_libexecdir = $(gimpplugindir)/plug-ins/cartoon
+checkerboard_libexecdir = $(gimpplugindir)/plug-ins/checkerboard
+cml_explorer_libexecdir = $(gimpplugindir)/plug-ins/cml-explorer
+color_cube_analyze_libexecdir = $(gimpplugindir)/plug-ins/color-cube-analyze
+colorify_libexecdir = $(gimpplugindir)/plug-ins/colorify
+colormap_remap_libexecdir = $(gimpplugindir)/plug-ins/colormap-remap
+compose_libexecdir = $(gimpplugindir)/plug-ins/compose
+contrast_normalize_libexecdir = $(gimpplugindir)/plug-ins/contrast-normalize
+contrast_retinex_libexecdir = $(gimpplugindir)/plug-ins/contrast-retinex
+crop_zealous_libexecdir = $(gimpplugindir)/plug-ins/crop-zealous
+#curve_bend_libexecdir = $(gimpplugindir)/plug-ins/curve-bend
+decompose_libexecdir = $(gimpplugindir)/plug-ins/decompose
+depth_merge_libexecdir = $(gimpplugindir)/plug-ins/depth-merge
+despeckle_libexecdir = $(gimpplugindir)/plug-ins/despeckle
+destripe_libexecdir = $(gimpplugindir)/plug-ins/destripe
+edge_dog_libexecdir = $(gimpplugindir)/plug-ins/edge-dog
+edge_neon_libexecdir = $(gimpplugindir)/plug-ins/edge-neon
+emboss_libexecdir = $(gimpplugindir)/plug-ins/emboss
+file_aa_libexecdir = $(gimpplugindir)/plug-ins/file-aa
+file_cel_libexecdir = $(gimpplugindir)/plug-ins/file-cel
+file_compressor_libexecdir = $(gimpplugindir)/plug-ins/file-compressor
+file_csource_libexecdir = $(gimpplugindir)/plug-ins/file-csource
+file_desktop_link_libexecdir = $(gimpplugindir)/plug-ins/file-desktop-link
+file_dicom_libexecdir = $(gimpplugindir)/plug-ins/file-dicom
+file_gbr_libexecdir = $(gimpplugindir)/plug-ins/file-gbr
+file_gegl_libexecdir = $(gimpplugindir)/plug-ins/file-gegl
+file_gif_load_libexecdir = $(gimpplugindir)/plug-ins/file-gif-load
+file_gif_save_libexecdir = $(gimpplugindir)/plug-ins/file-gif-save
+file_gih_libexecdir = $(gimpplugindir)/plug-ins/file-gih
+file_glob_libexecdir = $(gimpplugindir)/plug-ins/file-glob
+file_header_libexecdir = $(gimpplugindir)/plug-ins/file-header
+file_heif_libexecdir = $(gimpplugindir)/plug-ins/file-heif
+file_html_table_libexecdir = $(gimpplugindir)/plug-ins/file-html-table
+file_jp2_load_libexecdir = $(gimpplugindir)/plug-ins/file-jp2-load
+file_mng_libexecdir = $(gimpplugindir)/plug-ins/file-mng
+file_pat_libexecdir = $(gimpplugindir)/plug-ins/file-pat
+file_pcx_libexecdir = $(gimpplugindir)/plug-ins/file-pcx
+file_pdf_load_libexecdir = $(gimpplugindir)/plug-ins/file-pdf-load
+file_pdf_save_libexecdir = $(gimpplugindir)/plug-ins/file-pdf-save
+file_pix_libexecdir = $(gimpplugindir)/plug-ins/file-pix
+file_png_libexecdir = $(gimpplugindir)/plug-ins/file-png
+file_pnm_libexecdir = $(gimpplugindir)/plug-ins/file-pnm
+file_ps_libexecdir = $(gimpplugindir)/plug-ins/file-ps
+file_psp_libexecdir = $(gimpplugindir)/plug-ins/file-psp
+file_raw_data_libexecdir = $(gimpplugindir)/plug-ins/file-raw-data
+file_sunras_libexecdir = $(gimpplugindir)/plug-ins/file-sunras
+file_svg_libexecdir = $(gimpplugindir)/plug-ins/file-svg
+file_tga_libexecdir = $(gimpplugindir)/plug-ins/file-tga
+file_wmf_libexecdir = $(gimpplugindir)/plug-ins/file-wmf
+file_xbm_libexecdir = $(gimpplugindir)/plug-ins/file-xbm
+file_xmc_libexecdir = $(gimpplugindir)/plug-ins/file-xmc
+file_xpm_libexecdir = $(gimpplugindir)/plug-ins/file-xpm
+file_xwd_libexecdir = $(gimpplugindir)/plug-ins/file-xwd
+film_libexecdir = $(gimpplugindir)/plug-ins/film
+filter_pack_libexecdir = $(gimpplugindir)/plug-ins/filter-pack
+fractal_trace_libexecdir = $(gimpplugindir)/plug-ins/fractal-trace
+goat_exercise_libexecdir = $(gimpplugindir)/plug-ins/goat-exercise
+gradient_map_libexecdir = $(gimpplugindir)/plug-ins/gradient-map
+grid_libexecdir = $(gimpplugindir)/plug-ins/grid
+guillotine_libexecdir = $(gimpplugindir)/plug-ins/guillotine
+hot_libexecdir = $(gimpplugindir)/plug-ins/hot
+jigsaw_libexecdir = $(gimpplugindir)/plug-ins/jigsaw
+mail_libexecdir = $(gimpplugindir)/plug-ins/mail
+max_rgb_libexecdir = $(gimpplugindir)/plug-ins/max-rgb
+newsprint_libexecdir = $(gimpplugindir)/plug-ins/newsprint
+nl_filter_libexecdir = $(gimpplugindir)/plug-ins/nl-filter
+oilify_libexecdir = $(gimpplugindir)/plug-ins/oilify
+photocopy_libexecdir = $(gimpplugindir)/plug-ins/photocopy
+plugin_browser_libexecdir = $(gimpplugindir)/plug-ins/plugin-browser
+procedure_browser_libexecdir = $(gimpplugindir)/plug-ins/procedure-browser
+qbist_libexecdir = $(gimpplugindir)/plug-ins/qbist
+sample_colorize_libexecdir = $(gimpplugindir)/plug-ins/sample-colorize
+sharpen_libexecdir = $(gimpplugindir)/plug-ins/sharpen
+smooth_palette_libexecdir = $(gimpplugindir)/plug-ins/smooth-palette
+softglow_libexecdir = $(gimpplugindir)/plug-ins/softglow
+sparkle_libexecdir = $(gimpplugindir)/plug-ins/sparkle
+sphere_designer_libexecdir = $(gimpplugindir)/plug-ins/sphere-designer
+tile_libexecdir = $(gimpplugindir)/plug-ins/tile
+tile_small_libexecdir = $(gimpplugindir)/plug-ins/tile-small
+unit_editor_libexecdir = $(gimpplugindir)/plug-ins/unit-editor
+unsharp_mask_libexecdir = $(gimpplugindir)/plug-ins/unsharp-mask
+van_gogh_lic_libexecdir = $(gimpplugindir)/plug-ins/van-gogh-lic
+warp_libexecdir = $(gimpplugindir)/plug-ins/warp
+wavelet_decompose_libexecdir = $(gimpplugindir)/plug-ins/wavelet-decompose
+web_browser_libexecdir = $(gimpplugindir)/plug-ins/web-browser
+web_page_libexecdir = $(gimpplugindir)/plug-ins/web-page
+
+
+align_layers_libexec_PROGRAMS = align-layers
+animation_optimize_libexec_PROGRAMS = animation-optimize
+#animation_play_libexec_PROGRAMS = animation-play
+blinds_libexec_PROGRAMS = blinds
+blur_libexec_PROGRAMS = blur
+border_average_libexec_PROGRAMS = border-average
+cartoon_libexec_PROGRAMS = cartoon
+checkerboard_libexec_PROGRAMS = checkerboard
+cml_explorer_libexec_PROGRAMS = cml-explorer
+color_cube_analyze_libexec_PROGRAMS = color-cube-analyze
+colorify_libexec_PROGRAMS = colorify
+colormap_remap_libexec_PROGRAMS = colormap-remap
+compose_libexec_PROGRAMS = compose
+contrast_normalize_libexec_PROGRAMS = contrast-normalize
+contrast_retinex_libexec_PROGRAMS = contrast-retinex
+crop_zealous_libexec_PROGRAMS = crop-zealous
+#curve_bend_libexec_PROGRAMS = curve-bend
+decompose_libexec_PROGRAMS = decompose
+depth_merge_libexec_PROGRAMS = depth-merge
+despeckle_libexec_PROGRAMS = despeckle
+destripe_libexec_PROGRAMS = destripe
+edge_dog_libexec_PROGRAMS = edge-dog
+edge_neon_libexec_PROGRAMS = edge-neon
+emboss_libexec_PROGRAMS = emboss
+file_aa_libexec_PROGRAMS = $(FILE_AA)
+file_cel_libexec_PROGRAMS = file-cel
+file_compressor_libexec_PROGRAMS = file-compressor
+file_csource_libexec_PROGRAMS = file-csource
+file_desktop_link_libexec_PROGRAMS = file-desktop-link
+file_dicom_libexec_PROGRAMS = file-dicom
+file_gbr_libexec_PROGRAMS = file-gbr
+file_gegl_libexec_PROGRAMS = file-gegl
+file_gif_load_libexec_PROGRAMS = file-gif-load
+file_gif_save_libexec_PROGRAMS = file-gif-save
+file_gih_libexec_PROGRAMS = file-gih
+file_glob_libexec_PROGRAMS = file-glob
+file_header_libexec_PROGRAMS = file-header
+file_heif_libexec_PROGRAMS = $(FILE_HEIF)
+file_html_table_libexec_PROGRAMS = file-html-table
+file_jp2_load_libexec_PROGRAMS = $(FILE_JP2_LOAD)
+file_mng_libexec_PROGRAMS = $(FILE_MNG)
+file_pat_libexec_PROGRAMS = file-pat
+file_pcx_libexec_PROGRAMS = file-pcx
+file_pdf_load_libexec_PROGRAMS = file-pdf-load
+file_pdf_save_libexec_PROGRAMS = $(FILE_PDF_SAVE)
+file_pix_libexec_PROGRAMS = file-pix
+file_png_libexec_PROGRAMS = file-png
+file_pnm_libexec_PROGRAMS = file-pnm
+file_ps_libexec_PROGRAMS = $(FILE_PS)
+file_psp_libexec_PROGRAMS = file-psp
+file_raw_data_libexec_PROGRAMS = file-raw-data
+file_sunras_libexec_PROGRAMS = file-sunras
+file_svg_libexec_PROGRAMS = file-svg
+file_tga_libexec_PROGRAMS = file-tga
+file_wmf_libexec_PROGRAMS = $(FILE_WMF)
+file_xbm_libexec_PROGRAMS = file-xbm
+file_xmc_libexec_PROGRAMS = $(FILE_XMC)
+file_xpm_libexec_PROGRAMS = $(FILE_XPM)
+file_xwd_libexec_PROGRAMS = file-xwd
+film_libexec_PROGRAMS = film
+filter_pack_libexec_PROGRAMS = filter-pack
+fractal_trace_libexec_PROGRAMS = fractal-trace
+goat_exercise_libexec_PROGRAMS = goat-exercise
+gradient_map_libexec_PROGRAMS = gradient-map
+grid_libexec_PROGRAMS = grid
+guillotine_libexec_PROGRAMS = guillotine
+hot_libexec_PROGRAMS = hot
+jigsaw_libexec_PROGRAMS = jigsaw
+mail_libexec_PROGRAMS = $(MAIL)
+max_rgb_libexec_PROGRAMS = max-rgb
+newsprint_libexec_PROGRAMS = newsprint
+nl_filter_libexec_PROGRAMS = nl-filter
+oilify_libexec_PROGRAMS = oilify
+photocopy_libexec_PROGRAMS = photocopy
+plugin_browser_libexec_PROGRAMS = plugin-browser
+procedure_browser_libexec_PROGRAMS = procedure-browser
+qbist_libexec_PROGRAMS = qbist
+sample_colorize_libexec_PROGRAMS = sample-colorize
+sharpen_libexec_PROGRAMS = sharpen
+smooth_palette_libexec_PROGRAMS = smooth-palette
+softglow_libexec_PROGRAMS = softglow
+sparkle_libexec_PROGRAMS = sparkle
+sphere_designer_libexec_PROGRAMS = sphere-designer
+tile_libexec_PROGRAMS = tile
+tile_small_libexec_PROGRAMS = tile-small
+unit_editor_libexec_PROGRAMS = unit-editor
+unsharp_mask_libexec_PROGRAMS = unsharp-mask
+van_gogh_lic_libexec_PROGRAMS = van-gogh-lic
+warp_libexec_PROGRAMS = warp
+wavelet_decompose_libexec_PROGRAMS = wavelet-decompose
+web_browser_libexec_PROGRAMS = web-browser
+web_page_libexec_PROGRAMS = $(WEB_PAGE)
+
 
 EXTRA_PROGRAMS = \
-       file-aa/file-aa \
-       file-heif/file-heif \
-       file-jp2-load/file-jp2-load \
-       file-mng/file-mng \
-       file-pdf-save/file-pdf-save \
-       file-ps/file-ps \
-       file-wmf/file-wmf \
-       file-xmc/file-xmc \
-       file-xpm/file-xpm \
-       mail/mail \
-       web-page/web-page
+       file-aa \
+       file-heif \
+       file-jp2-load \
+       file-mng \
+       file-pdf-save \
+       file-ps \
+       file-wmf \
+       file-xmc \
+       file-xpm \
+       mail \
+       web-page
 
 install-%: %
        @$(NORMAL_INSTALL)
@@ -169,10 +259,10 @@ install-%: %
          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$f 
|| exit 1; \
        else :; fi
 
-align_layers_align_layers_SOURCES = \
+align_layers_SOURCES = \
        align-layers.c
 
-align_layers_align_layers_LDADD = \
+align_layers_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -186,10 +276,10 @@ align_layers_align_layers_LDADD = \
        $(INTLLIBS)             \
        $(align_layers_RC)
 
-animation_optimize_animation_optimize_SOURCES = \
+animation_optimize_SOURCES = \
        animation-optimize.c
 
-animation_optimize_animation_optimize_LDADD = \
+animation_optimize_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -201,10 +291,10 @@ animation_optimize_animation_optimize_LDADD = \
        $(INTLLIBS)             \
        $(animation_optimize_RC)
 
-animation_play_animation_play_SOURCES = \
+animation_play_SOURCES = \
        animation-play.c
 
-animation_play_animation_play_LDADD = \
+animation_play_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -219,10 +309,10 @@ animation_play_animation_play_LDADD = \
        $(INTLLIBS)             \
        $(animation_play_RC)
 
-blinds_blinds_SOURCES = \
+blinds_SOURCES = \
        blinds.c
 
-blinds_blinds_LDADD = \
+blinds_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -236,10 +326,10 @@ blinds_blinds_LDADD = \
        $(INTLLIBS)             \
        $(blinds_RC)
 
-blur_blur_SOURCES = \
+blur_SOURCES = \
        blur.c
 
-blur_blur_LDADD = \
+blur_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -251,10 +341,10 @@ blur_blur_LDADD = \
        $(INTLLIBS)             \
        $(blur_RC)
 
-border_average_border_average_SOURCES = \
+border_average_SOURCES = \
        border-average.c
 
-border_average_border_average_LDADD = \
+border_average_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -269,10 +359,10 @@ border_average_border_average_LDADD = \
        $(INTLLIBS)             \
        $(border_average_RC)
 
-cartoon_cartoon_SOURCES = \
+cartoon_SOURCES = \
        cartoon.c
 
-cartoon_cartoon_LDADD = \
+cartoon_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -286,10 +376,10 @@ cartoon_cartoon_LDADD = \
        $(INTLLIBS)             \
        $(cartoon_RC)
 
-checkerboard_checkerboard_SOURCES = \
+checkerboard_SOURCES = \
        checkerboard.c
 
-checkerboard_checkerboard_LDADD = \
+checkerboard_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -303,10 +393,10 @@ checkerboard_checkerboard_LDADD = \
        $(INTLLIBS)             \
        $(checkerboard_RC)
 
-cml_explorer_cml_explorer_SOURCES = \
+cml_explorer_SOURCES = \
        cml-explorer.c
 
-cml_explorer_cml_explorer_LDADD = \
+cml_explorer_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -320,10 +410,10 @@ cml_explorer_cml_explorer_LDADD = \
        $(INTLLIBS)             \
        $(cml_explorer_RC)
 
-color_cube_analyze_color_cube_analyze_SOURCES = \
+color_cube_analyze_SOURCES = \
        color-cube-analyze.c
 
-color_cube_analyze_color_cube_analyze_LDADD = \
+color_cube_analyze_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -337,10 +427,10 @@ color_cube_analyze_color_cube_analyze_LDADD = \
        $(INTLLIBS)             \
        $(color_cube_analyze_RC)
 
-colorify_colorify_SOURCES = \
+colorify_SOURCES = \
        colorify.c
 
-colorify_colorify_LDADD = \
+colorify_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -354,10 +444,10 @@ colorify_colorify_LDADD = \
        $(INTLLIBS)             \
        $(colorify_RC)
 
-colormap_remap_colormap_remap_SOURCES = \
+colormap_remap_SOURCES = \
        colormap-remap.c
 
-colormap_remap_colormap_remap_LDADD = \
+colormap_remap_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -372,10 +462,10 @@ colormap_remap_colormap_remap_LDADD = \
        $(INTLLIBS)             \
        $(colormap_remap_RC)
 
-compose_compose_SOURCES = \
+compose_SOURCES = \
        compose.c
 
-compose_compose_LDADD = \
+compose_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -390,10 +480,10 @@ compose_compose_LDADD = \
        $(INTLLIBS)             \
        $(compose_RC)
 
-contrast_normalize_contrast_normalize_SOURCES = \
+contrast_normalize_SOURCES = \
        contrast-normalize.c
 
-contrast_normalize_contrast_normalize_LDADD = \
+contrast_normalize_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -405,10 +495,10 @@ contrast_normalize_contrast_normalize_LDADD = \
        $(INTLLIBS)             \
        $(contrast_normalize_RC)
 
-contrast_retinex_contrast_retinex_SOURCES = \
+contrast_retinex_SOURCES = \
        contrast-retinex.c
 
-contrast_retinex_contrast_retinex_LDADD = \
+contrast_retinex_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -422,10 +512,10 @@ contrast_retinex_contrast_retinex_LDADD = \
        $(INTLLIBS)             \
        $(contrast_retinex_RC)
 
-crop_zealous_crop_zealous_SOURCES = \
+crop_zealous_SOURCES = \
        crop-zealous.c
 
-crop_zealous_crop_zealous_LDADD = \
+crop_zealous_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -438,10 +528,10 @@ crop_zealous_crop_zealous_LDADD = \
        $(INTLLIBS)             \
        $(crop_zealous_RC)
 
-curve_bend_curve_bend_SOURCES = \
+curve_bend_SOURCES = \
        curve-bend.c
 
-curve_bend_curve_bend_LDADD = \
+curve_bend_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -455,10 +545,10 @@ curve_bend_curve_bend_LDADD = \
        $(INTLLIBS)             \
        $(curve_bend_RC)
 
-decompose_decompose_SOURCES = \
+decompose_SOURCES = \
        decompose.c
 
-decompose_decompose_LDADD = \
+decompose_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -473,10 +563,10 @@ decompose_decompose_LDADD = \
        $(INTLLIBS)             \
        $(decompose_RC)
 
-depth_merge_depth_merge_SOURCES = \
+depth_merge_SOURCES = \
        depth-merge.c
 
-depth_merge_depth_merge_LDADD = \
+depth_merge_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -490,10 +580,10 @@ depth_merge_depth_merge_LDADD = \
        $(INTLLIBS)             \
        $(depth_merge_RC)
 
-despeckle_despeckle_SOURCES = \
+despeckle_SOURCES = \
        despeckle.c
 
-despeckle_despeckle_LDADD = \
+despeckle_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -507,10 +597,10 @@ despeckle_despeckle_LDADD = \
        $(INTLLIBS)             \
        $(despeckle_RC)
 
-destripe_destripe_SOURCES = \
+destripe_SOURCES = \
        destripe.c
 
-destripe_destripe_LDADD = \
+destripe_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -524,10 +614,10 @@ destripe_destripe_LDADD = \
        $(INTLLIBS)             \
        $(destripe_RC)
 
-edge_dog_edge_dog_SOURCES = \
+edge_dog_SOURCES = \
        edge-dog.c
 
-edge_dog_edge_dog_LDADD = \
+edge_dog_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -541,10 +631,10 @@ edge_dog_edge_dog_LDADD = \
        $(INTLLIBS)             \
        $(edge_dog_RC)
 
-edge_neon_edge_neon_SOURCES = \
+edge_neon_SOURCES = \
        edge-neon.c
 
-edge_neon_edge_neon_LDADD = \
+edge_neon_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -558,10 +648,10 @@ edge_neon_edge_neon_LDADD = \
        $(INTLLIBS)             \
        $(edge_neon_RC)
 
-emboss_emboss_SOURCES = \
+emboss_SOURCES = \
        emboss.c
 
-emboss_emboss_LDADD = \
+emboss_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -575,10 +665,10 @@ emboss_emboss_LDADD = \
        $(INTLLIBS)             \
        $(emboss_RC)
 
-file_aa_file_aa_SOURCES = \
+file_aa_SOURCES = \
        file-aa.c
 
-file_aa_file_aa_LDADD = \
+file_aa_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -594,10 +684,10 @@ file_aa_file_aa_LDADD = \
        $(INTLLIBS)             \
        $(file_aa_RC)
 
-file_cel_file_cel_SOURCES = \
+file_cel_SOURCES = \
        file-cel.c
 
-file_cel_file_cel_LDADD = \
+file_cel_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -612,12 +702,12 @@ file_cel_file_cel_LDADD = \
        $(INTLLIBS)             \
        $(file_cel_RC)
 
-file_compressor_file_compressor_CFLAGS = $(LZMA_CFLAGS)
+file_compressor_CFLAGS = $(LZMA_CFLAGS)
 
-file_compressor_file_compressor_SOURCES = \
+file_compressor_SOURCES = \
        file-compressor.c
 
-file_compressor_file_compressor_LDADD = \
+file_compressor_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -633,10 +723,10 @@ file_compressor_file_compressor_LDADD = \
        $(INTLLIBS)             \
        $(file_compressor_RC)
 
-file_csource_file_csource_SOURCES = \
+file_csource_SOURCES = \
        file-csource.c
 
-file_csource_file_csource_LDADD = \
+file_csource_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -651,10 +741,10 @@ file_csource_file_csource_LDADD = \
        $(INTLLIBS)             \
        $(file_csource_RC)
 
-file_desktop_link_file_desktop_link_SOURCES = \
+file_desktop_link_SOURCES = \
        file-desktop-link.c
 
-file_desktop_link_file_desktop_link_LDADD = \
+file_desktop_link_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -666,12 +756,12 @@ file_desktop_link_file_desktop_link_LDADD = \
        $(INTLLIBS)             \
        $(file_desktop_link_RC)
 
-file_dicom_file_dicom_CFLAGS = -fno-strict-aliasing
+file_dicom_CFLAGS = -fno-strict-aliasing
 
-file_dicom_file_dicom_SOURCES = \
+file_dicom_SOURCES = \
        file-dicom.c
 
-file_dicom_file_dicom_LDADD = \
+file_dicom_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -686,10 +776,10 @@ file_dicom_file_dicom_LDADD = \
        $(INTLLIBS)             \
        $(file_dicom_RC)
 
-file_gbr_file_gbr_SOURCES = \
+file_gbr_SOURCES = \
        file-gbr.c
 
-file_gbr_file_gbr_LDADD = \
+file_gbr_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -704,10 +794,10 @@ file_gbr_file_gbr_LDADD = \
        $(INTLLIBS)             \
        $(file_gbr_RC)
 
-file_gegl_file_gegl_SOURCES = \
+file_gegl_SOURCES = \
        file-gegl.c
 
-file_gegl_file_gegl_LDADD = \
+file_gegl_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -722,10 +812,10 @@ file_gegl_file_gegl_LDADD = \
        $(INTLLIBS)             \
        $(file_gegl_RC)
 
-file_gif_load_file_gif_load_SOURCES = \
+file_gif_load_SOURCES = \
        file-gif-load.c
 
-file_gif_load_file_gif_load_LDADD = \
+file_gif_load_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -738,10 +828,10 @@ file_gif_load_file_gif_load_LDADD = \
        $(INTLLIBS)             \
        $(file_gif_load_RC)
 
-file_gif_save_file_gif_save_SOURCES = \
+file_gif_save_SOURCES = \
        file-gif-save.c
 
-file_gif_save_file_gif_save_LDADD = \
+file_gif_save_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -756,10 +846,10 @@ file_gif_save_file_gif_save_LDADD = \
        $(INTLLIBS)             \
        $(file_gif_save_RC)
 
-file_gih_file_gih_SOURCES = \
+file_gih_SOURCES = \
        file-gih.c
 
-file_gih_file_gih_LDADD = \
+file_gih_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -774,10 +864,10 @@ file_gih_file_gih_LDADD = \
        $(INTLLIBS)             \
        $(file_gih_RC)
 
-file_glob_file_glob_SOURCES = \
+file_glob_SOURCES = \
        file-glob.c
 
-file_glob_file_glob_LDADD = \
+file_glob_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -789,10 +879,10 @@ file_glob_file_glob_LDADD = \
        $(INTLLIBS)             \
        $(file_glob_RC)
 
-file_header_file_header_SOURCES = \
+file_header_SOURCES = \
        file-header.c
 
-file_header_file_header_LDADD = \
+file_header_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -807,12 +897,12 @@ file_header_file_header_LDADD = \
        $(INTLLIBS)             \
        $(file_header_RC)
 
-file_heif_file_heif_CFLAGS = $(LIBHEIF_CFLAGS)
+file_heif_CFLAGS = $(LIBHEIF_CFLAGS)
 
-file_heif_file_heif_SOURCES = \
+file_heif_SOURCES = \
        file-heif.c
 
-file_heif_file_heif_LDADD = \
+file_heif_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -828,10 +918,10 @@ file_heif_file_heif_LDADD = \
        $(INTLLIBS)             \
        $(file_heif_RC)
 
-file_html_table_file_html_table_SOURCES = \
+file_html_table_SOURCES = \
        file-html-table.c
 
-file_html_table_file_html_table_LDADD = \
+file_html_table_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -846,12 +936,12 @@ file_html_table_file_html_table_LDADD = \
        $(INTLLIBS)             \
        $(file_html_table_RC)
 
-file_jp2_load_file_jp2_load_CFLAGS = $(OPENJPEG_CFLAGS)
+file_jp2_load_CFLAGS = $(OPENJPEG_CFLAGS)
 
-file_jp2_load_file_jp2_load_SOURCES = \
+file_jp2_load_SOURCES = \
        file-jp2-load.c
 
-file_jp2_load_file_jp2_load_LDADD = \
+file_jp2_load_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -867,12 +957,12 @@ file_jp2_load_file_jp2_load_LDADD = \
        $(INTLLIBS)             \
        $(file_jp2_load_RC)
 
-file_mng_file_mng_CFLAGS = $(MNG_CFLAGS)
+file_mng_CFLAGS = $(MNG_CFLAGS)
 
-file_mng_file_mng_SOURCES = \
+file_mng_SOURCES = \
        file-mng.c
 
-file_mng_file_mng_LDADD = \
+file_mng_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -888,10 +978,10 @@ file_mng_file_mng_LDADD = \
        $(INTLLIBS)             \
        $(file_mng_RC)
 
-file_pat_file_pat_SOURCES = \
+file_pat_SOURCES = \
        file-pat.c
 
-file_pat_file_pat_LDADD = \
+file_pat_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -906,10 +996,10 @@ file_pat_file_pat_LDADD = \
        $(INTLLIBS)             \
        $(file_pat_RC)
 
-file_pcx_file_pcx_SOURCES = \
+file_pcx_SOURCES = \
        file-pcx.c
 
-file_pcx_file_pcx_LDADD = \
+file_pcx_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -924,12 +1014,12 @@ file_pcx_file_pcx_LDADD = \
        $(INTLLIBS)             \
        $(file_pcx_RC)
 
-file_pdf_load_file_pdf_load_CFLAGS = $(POPPLER_CFLAGS)
+file_pdf_load_CFLAGS = $(POPPLER_CFLAGS)
 
-file_pdf_load_file_pdf_load_SOURCES = \
+file_pdf_load_SOURCES = \
        file-pdf-load.c
 
-file_pdf_load_file_pdf_load_LDADD = \
+file_pdf_load_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -944,12 +1034,12 @@ file_pdf_load_file_pdf_load_LDADD = \
        $(INTLLIBS)             \
        $(file_pdf_load_RC)
 
-file_pdf_save_file_pdf_save_CFLAGS = $(CAIRO_PDF_CFLAGS)
+file_pdf_save_CFLAGS = $(CAIRO_PDF_CFLAGS)
 
-file_pdf_save_file_pdf_save_SOURCES = \
+file_pdf_save_SOURCES = \
        file-pdf-save.c
 
-file_pdf_save_file_pdf_save_LDADD = \
+file_pdf_save_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -965,10 +1055,10 @@ file_pdf_save_file_pdf_save_LDADD = \
        $(INTLLIBS)             \
        $(file_pdf_save_RC)
 
-file_pix_file_pix_SOURCES = \
+file_pix_SOURCES = \
        file-pix.c
 
-file_pix_file_pix_LDADD = \
+file_pix_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -983,12 +1073,12 @@ file_pix_file_pix_LDADD = \
        $(INTLLIBS)             \
        $(file_pix_RC)
 
-file_png_file_png_CFLAGS = $(PNG_CFLAGS)
+file_png_CFLAGS = $(PNG_CFLAGS)
 
-file_png_file_png_SOURCES = \
+file_png_SOURCES = \
        file-png.c
 
-file_png_file_png_LDADD = \
+file_png_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1004,10 +1094,10 @@ file_png_file_png_LDADD = \
        $(INTLLIBS)             \
        $(file_png_RC)
 
-file_pnm_file_pnm_SOURCES = \
+file_pnm_SOURCES = \
        file-pnm.c
 
-file_pnm_file_pnm_LDADD = \
+file_pnm_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1022,10 +1112,10 @@ file_pnm_file_pnm_LDADD = \
        $(INTLLIBS)             \
        $(file_pnm_RC)
 
-file_ps_file_ps_SOURCES = \
+file_ps_SOURCES = \
        file-ps.c
 
-file_ps_file_ps_LDADD = \
+file_ps_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1041,10 +1131,10 @@ file_ps_file_ps_LDADD = \
        $(INTLLIBS)             \
        $(file_ps_RC)
 
-file_psp_file_psp_SOURCES = \
+file_psp_SOURCES = \
        file-psp.c
 
-file_psp_file_psp_LDADD = \
+file_psp_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1060,10 +1150,10 @@ file_psp_file_psp_LDADD = \
        $(INTLLIBS)             \
        $(file_psp_RC)
 
-file_raw_data_file_raw_data_SOURCES = \
+file_raw_data_SOURCES = \
        file-raw-data.c
 
-file_raw_data_file_raw_data_LDADD = \
+file_raw_data_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1078,10 +1168,10 @@ file_raw_data_file_raw_data_LDADD = \
        $(INTLLIBS)             \
        $(file_raw_data_RC)
 
-file_sunras_file_sunras_SOURCES = \
+file_sunras_SOURCES = \
        file-sunras.c
 
-file_sunras_file_sunras_LDADD = \
+file_sunras_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1096,12 +1186,12 @@ file_sunras_file_sunras_LDADD = \
        $(INTLLIBS)             \
        $(file_sunras_RC)
 
-file_svg_file_svg_CFLAGS = $(SVG_CFLAGS)
+file_svg_CFLAGS = $(SVG_CFLAGS)
 
-file_svg_file_svg_SOURCES = \
+file_svg_SOURCES = \
        file-svg.c
 
-file_svg_file_svg_LDADD = \
+file_svg_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1116,10 +1206,10 @@ file_svg_file_svg_LDADD = \
        $(INTLLIBS)             \
        $(file_svg_RC)
 
-file_tga_file_tga_SOURCES = \
+file_tga_SOURCES = \
        file-tga.c
 
-file_tga_file_tga_LDADD = \
+file_tga_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1134,12 +1224,12 @@ file_tga_file_tga_LDADD = \
        $(INTLLIBS)             \
        $(file_tga_RC)
 
-file_wmf_file_wmf_CFLAGS = $(WMF_CFLAGS)
+file_wmf_CFLAGS = $(WMF_CFLAGS)
 
-file_wmf_file_wmf_SOURCES = \
+file_wmf_SOURCES = \
        file-wmf.c
 
-file_wmf_file_wmf_LDADD = \
+file_wmf_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1155,10 +1245,10 @@ file_wmf_file_wmf_LDADD = \
        $(INTLLIBS)             \
        $(file_wmf_RC)
 
-file_xbm_file_xbm_SOURCES = \
+file_xbm_SOURCES = \
        file-xbm.c
 
-file_xbm_file_xbm_LDADD = \
+file_xbm_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1173,10 +1263,10 @@ file_xbm_file_xbm_LDADD = \
        $(INTLLIBS)             \
        $(file_xbm_RC)
 
-file_xmc_file_xmc_SOURCES = \
+file_xmc_SOURCES = \
        file-xmc.c
 
-file_xmc_file_xmc_LDADD = \
+file_xmc_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1192,10 +1282,10 @@ file_xmc_file_xmc_LDADD = \
        $(INTLLIBS)             \
        $(file_xmc_RC)
 
-file_xpm_file_xpm_SOURCES = \
+file_xpm_SOURCES = \
        file-xpm.c
 
-file_xpm_file_xpm_LDADD = \
+file_xpm_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1211,10 +1301,10 @@ file_xpm_file_xpm_LDADD = \
        $(INTLLIBS)             \
        $(file_xpm_RC)
 
-file_xwd_file_xwd_SOURCES = \
+file_xwd_SOURCES = \
        file-xwd.c
 
-file_xwd_file_xwd_LDADD = \
+file_xwd_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1229,10 +1319,10 @@ file_xwd_file_xwd_LDADD = \
        $(INTLLIBS)             \
        $(file_xwd_RC)
 
-film_film_SOURCES = \
+film_SOURCES = \
        film.c
 
-film_film_LDADD = \
+film_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1246,10 +1336,10 @@ film_film_LDADD = \
        $(INTLLIBS)             \
        $(film_RC)
 
-filter_pack_filter_pack_SOURCES = \
+filter_pack_SOURCES = \
        filter-pack.c
 
-filter_pack_filter_pack_LDADD = \
+filter_pack_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1263,10 +1353,10 @@ filter_pack_filter_pack_LDADD = \
        $(INTLLIBS)             \
        $(filter_pack_RC)
 
-fractal_trace_fractal_trace_SOURCES = \
+fractal_trace_SOURCES = \
        fractal-trace.c
 
-fractal_trace_fractal_trace_LDADD = \
+fractal_trace_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1280,10 +1370,10 @@ fractal_trace_fractal_trace_LDADD = \
        $(INTLLIBS)             \
        $(fractal_trace_RC)
 
-goat_exercise_goat_exercise_SOURCES = \
+goat_exercise_SOURCES = \
        goat-exercise.c
 
-goat_exercise_goat_exercise_LDADD = \
+goat_exercise_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -1296,10 +1386,10 @@ goat_exercise_goat_exercise_LDADD = \
        $(INTLLIBS)             \
        $(goat_exercise_RC)
 
-gradient_map_gradient_map_SOURCES = \
+gradient_map_SOURCES = \
        gradient-map.c
 
-gradient_map_gradient_map_LDADD = \
+gradient_map_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -1312,10 +1402,10 @@ gradient_map_gradient_map_LDADD = \
        $(INTLLIBS)             \
        $(gradient_map_RC)
 
-grid_grid_SOURCES = \
+grid_SOURCES = \
        grid.c
 
-grid_grid_LDADD = \
+grid_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1329,10 +1419,10 @@ grid_grid_LDADD = \
        $(INTLLIBS)             \
        $(grid_RC)
 
-guillotine_guillotine_SOURCES = \
+guillotine_SOURCES = \
        guillotine.c
 
-guillotine_guillotine_LDADD = \
+guillotine_LDADD = \
        $(libgimp)              \
        $(libgimpmath)          \
        $(libgimpconfig)        \
@@ -1344,10 +1434,10 @@ guillotine_guillotine_LDADD = \
        $(INTLLIBS)             \
        $(guillotine_RC)
 
-hot_hot_SOURCES = \
+hot_SOURCES = \
        hot.c
 
-hot_hot_LDADD = \
+hot_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1361,10 +1451,10 @@ hot_hot_LDADD = \
        $(INTLLIBS)             \
        $(hot_RC)
 
-jigsaw_jigsaw_SOURCES = \
+jigsaw_SOURCES = \
        jigsaw.c
 
-jigsaw_jigsaw_LDADD = \
+jigsaw_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1378,10 +1468,10 @@ jigsaw_jigsaw_LDADD = \
        $(INTLLIBS)             \
        $(jigsaw_RC)
 
-mail_mail_SOURCES = \
+mail_SOURCES = \
        mail.c
 
-mail_mail_LDADD = \
+mail_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1395,10 +1485,10 @@ mail_mail_LDADD = \
        $(INTLLIBS)             \
        $(mail_RC)
 
-max_rgb_max_rgb_SOURCES = \
+max_rgb_SOURCES = \
        max-rgb.c
 
-max_rgb_max_rgb_LDADD = \
+max_rgb_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1412,10 +1502,10 @@ max_rgb_max_rgb_LDADD = \
        $(INTLLIBS)             \
        $(max_rgb_RC)
 
-newsprint_newsprint_SOURCES = \
+newsprint_SOURCES = \
        newsprint.c
 
-newsprint_newsprint_LDADD = \
+newsprint_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1429,10 +1519,10 @@ newsprint_newsprint_LDADD = \
        $(INTLLIBS)             \
        $(newsprint_RC)
 
-nl_filter_nl_filter_SOURCES = \
+nl_filter_SOURCES = \
        nl-filter.c
 
-nl_filter_nl_filter_LDADD = \
+nl_filter_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1446,10 +1536,10 @@ nl_filter_nl_filter_LDADD = \
        $(INTLLIBS)             \
        $(nl_filter_RC)
 
-oilify_oilify_SOURCES = \
+oilify_SOURCES = \
        oilify.c
 
-oilify_oilify_LDADD = \
+oilify_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1463,10 +1553,10 @@ oilify_oilify_LDADD = \
        $(INTLLIBS)             \
        $(oilify_RC)
 
-photocopy_photocopy_SOURCES = \
+photocopy_SOURCES = \
        photocopy.c
 
-photocopy_photocopy_LDADD = \
+photocopy_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1480,10 +1570,10 @@ photocopy_photocopy_LDADD = \
        $(INTLLIBS)             \
        $(photocopy_RC)
 
-plugin_browser_plugin_browser_SOURCES = \
+plugin_browser_SOURCES = \
        plugin-browser.c
 
-plugin_browser_plugin_browser_LDADD = \
+plugin_browser_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1497,10 +1587,10 @@ plugin_browser_plugin_browser_LDADD = \
        $(INTLLIBS)             \
        $(plugin_browser_RC)
 
-procedure_browser_procedure_browser_SOURCES = \
+procedure_browser_SOURCES = \
        procedure-browser.c
 
-procedure_browser_procedure_browser_LDADD = \
+procedure_browser_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1514,10 +1604,10 @@ procedure_browser_procedure_browser_LDADD = \
        $(INTLLIBS)             \
        $(procedure_browser_RC)
 
-qbist_qbist_SOURCES = \
+qbist_SOURCES = \
        qbist.c
 
-qbist_qbist_LDADD = \
+qbist_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1532,10 +1622,10 @@ qbist_qbist_LDADD = \
        $(INTLLIBS)             \
        $(qbist_RC)
 
-sample_colorize_sample_colorize_SOURCES = \
+sample_colorize_SOURCES = \
        sample-colorize.c
 
-sample_colorize_sample_colorize_LDADD = \
+sample_colorize_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1549,10 +1639,10 @@ sample_colorize_sample_colorize_LDADD = \
        $(INTLLIBS)             \
        $(sample_colorize_RC)
 
-sharpen_sharpen_SOURCES = \
+sharpen_SOURCES = \
        sharpen.c
 
-sharpen_sharpen_LDADD = \
+sharpen_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1566,10 +1656,10 @@ sharpen_sharpen_LDADD = \
        $(INTLLIBS)             \
        $(sharpen_RC)
 
-smooth_palette_smooth_palette_SOURCES = \
+smooth_palette_SOURCES = \
        smooth-palette.c
 
-smooth_palette_smooth_palette_LDADD = \
+smooth_palette_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1584,10 +1674,10 @@ smooth_palette_smooth_palette_LDADD = \
        $(INTLLIBS)             \
        $(smooth_palette_RC)
 
-softglow_softglow_SOURCES = \
+softglow_SOURCES = \
        softglow.c
 
-softglow_softglow_LDADD = \
+softglow_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1601,10 +1691,10 @@ softglow_softglow_LDADD = \
        $(INTLLIBS)             \
        $(softglow_RC)
 
-sparkle_sparkle_SOURCES = \
+sparkle_SOURCES = \
        sparkle.c
 
-sparkle_sparkle_LDADD = \
+sparkle_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1618,10 +1708,10 @@ sparkle_sparkle_LDADD = \
        $(INTLLIBS)             \
        $(sparkle_RC)
 
-sphere_designer_sphere_designer_SOURCES = \
+sphere_designer_SOURCES = \
        sphere-designer.c
 
-sphere_designer_sphere_designer_LDADD = \
+sphere_designer_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1635,10 +1725,10 @@ sphere_designer_sphere_designer_LDADD = \
        $(INTLLIBS)             \
        $(sphere_designer_RC)
 
-tile_tile_SOURCES = \
+tile_SOURCES = \
        tile.c
 
-tile_tile_LDADD = \
+tile_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1653,10 +1743,10 @@ tile_tile_LDADD = \
        $(INTLLIBS)             \
        $(tile_RC)
 
-tile_small_tile_small_SOURCES = \
+tile_small_SOURCES = \
        tile-small.c
 
-tile_small_tile_small_LDADD = \
+tile_small_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1670,10 +1760,10 @@ tile_small_tile_small_LDADD = \
        $(INTLLIBS)             \
        $(tile_small_RC)
 
-unit_editor_unit_editor_SOURCES = \
+unit_editor_SOURCES = \
        unit-editor.c
 
-unit_editor_unit_editor_LDADD = \
+unit_editor_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1687,10 +1777,10 @@ unit_editor_unit_editor_LDADD = \
        $(INTLLIBS)             \
        $(unit_editor_RC)
 
-unsharp_mask_unsharp_mask_SOURCES = \
+unsharp_mask_SOURCES = \
        unsharp-mask.c
 
-unsharp_mask_unsharp_mask_LDADD = \
+unsharp_mask_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1704,10 +1794,10 @@ unsharp_mask_unsharp_mask_LDADD = \
        $(INTLLIBS)             \
        $(unsharp_mask_RC)
 
-van_gogh_lic_van_gogh_lic_SOURCES = \
+van_gogh_lic_SOURCES = \
        van-gogh-lic.c
 
-van_gogh_lic_van_gogh_lic_LDADD = \
+van_gogh_lic_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1721,10 +1811,10 @@ van_gogh_lic_van_gogh_lic_LDADD = \
        $(INTLLIBS)             \
        $(van_gogh_lic_RC)
 
-warp_warp_SOURCES = \
+warp_SOURCES = \
        warp.c
 
-warp_warp_LDADD = \
+warp_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1738,10 +1828,10 @@ warp_warp_LDADD = \
        $(INTLLIBS)             \
        $(warp_RC)
 
-wavelet_decompose_wavelet_decompose_SOURCES = \
+wavelet_decompose_SOURCES = \
        wavelet-decompose.c
 
-wavelet_decompose_wavelet_decompose_LDADD = \
+wavelet_decompose_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1756,14 +1846,14 @@ wavelet_decompose_wavelet_decompose_LDADD = \
        $(INTLLIBS)             \
        $(wavelet_decompose_RC)
 
-web_browser_web_browser_LDFLAGS = $(framework_cocoa)
+web_browser_LDFLAGS = $(framework_cocoa)
 
-web_browser_web_browser_CPPFLAGS = $(AM_CPPFLAGS) $(xobjective_c)
+web_browser_CPPFLAGS = $(AM_CPPFLAGS) $(xobjective_c)
 
-web_browser_web_browser_SOURCES = \
+web_browser_SOURCES = \
        web-browser.c
 
-web_browser_web_browser_LDADD = \
+web_browser_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
@@ -1777,12 +1867,12 @@ web_browser_web_browser_LDADD = \
        $(INTLLIBS)             \
        $(web_browser_RC)
 
-web_page_web_page_CFLAGS = $(WEBKIT_CFLAGS)
+web_page_CFLAGS = $(WEBKIT_CFLAGS)
 
-web_page_web_page_SOURCES = \
+web_page_SOURCES = \
        web-page.c
 
-web_page_web_page_LDADD = \
+web_page_LDADD = \
        $(libgimpui)            \
        $(libgimpwidgets)       \
        $(libgimpmodule)        \
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index 27e39b8..b6aa422 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -1,92 +1,92 @@
-align_layers_align_layers_RC = align-layers.rc.o
-animation_optimize_animation_optimize_RC = animation-optimize.rc.o
-animation_play_animation_play_RC = animation-play.rc.o
-blinds_blinds_RC = blinds.rc.o
-blur_blur_RC = blur.rc.o
-border_average_border_average_RC = border-average.rc.o
-cartoon_cartoon_RC = cartoon.rc.o
-checkerboard_checkerboard_RC = checkerboard.rc.o
-cml_explorer_cml_explorer_RC = cml-explorer.rc.o
-color_cube_analyze_color_cube_analyze_RC = color-cube-analyze.rc.o
-colorify_colorify_RC = colorify.rc.o
-colormap_remap_colormap_remap_RC = colormap-remap.rc.o
-compose_compose_RC = compose.rc.o
-contrast_normalize_contrast_normalize_RC = contrast-normalize.rc.o
-contrast_retinex_contrast_retinex_RC = contrast-retinex.rc.o
-crop_zealous_crop_zealous_RC = crop-zealous.rc.o
-curve_bend_curve_bend_RC = curve-bend.rc.o
-decompose_decompose_RC = decompose.rc.o
-depth_merge_depth_merge_RC = depth-merge.rc.o
-despeckle_despeckle_RC = despeckle.rc.o
-destripe_destripe_RC = destripe.rc.o
-edge_dog_edge_dog_RC = edge-dog.rc.o
-edge_neon_edge_neon_RC = edge-neon.rc.o
-emboss_emboss_RC = emboss.rc.o
-file_aa_file_aa_RC = file-aa.rc.o
-file_cel_file_cel_RC = file-cel.rc.o
-file_compressor_file_compressor_RC = file-compressor.rc.o
-file_csource_file_csource_RC = file-csource.rc.o
-file_desktop_link_file_desktop_link_RC = file-desktop-link.rc.o
-file_dicom_file_dicom_RC = file-dicom.rc.o
-file_gbr_file_gbr_RC = file-gbr.rc.o
-file_gegl_file_gegl_RC = file-gegl.rc.o
-file_gif_load_file_gif_load_RC = file-gif-load.rc.o
-file_gif_save_file_gif_save_RC = file-gif-save.rc.o
-file_gih_file_gih_RC = file-gih.rc.o
-file_glob_file_glob_RC = file-glob.rc.o
-file_header_file_header_RC = file-header.rc.o
-file_heif_file_heif_RC = file-heif.rc.o
-file_html_table_file_html_table_RC = file-html-table.rc.o
-file_jp2_load_file_jp2_load_RC = file-jp2-load.rc.o
-file_mng_file_mng_RC = file-mng.rc.o
-file_pat_file_pat_RC = file-pat.rc.o
-file_pcx_file_pcx_RC = file-pcx.rc.o
-file_pdf_load_file_pdf_load_RC = file-pdf-load.rc.o
-file_pdf_save_file_pdf_save_RC = file-pdf-save.rc.o
-file_pix_file_pix_RC = file-pix.rc.o
-file_png_file_png_RC = file-png.rc.o
-file_pnm_file_pnm_RC = file-pnm.rc.o
-file_ps_file_ps_RC = file-ps.rc.o
-file_psp_file_psp_RC = file-psp.rc.o
-file_raw_data_file_raw_data_RC = file-raw-data.rc.o
-file_sunras_file_sunras_RC = file-sunras.rc.o
-file_svg_file_svg_RC = file-svg.rc.o
-file_tga_file_tga_RC = file-tga.rc.o
-file_wmf_file_wmf_RC = file-wmf.rc.o
-file_xbm_file_xbm_RC = file-xbm.rc.o
-file_xmc_file_xmc_RC = file-xmc.rc.o
-file_xpm_file_xpm_RC = file-xpm.rc.o
-file_xwd_file_xwd_RC = file-xwd.rc.o
-film_film_RC = film.rc.o
-filter_pack_filter_pack_RC = filter-pack.rc.o
-fractal_trace_fractal_trace_RC = fractal-trace.rc.o
-goat_exercise_goat_exercise_RC = goat-exercise.rc.o
-gradient_map_gradient_map_RC = gradient-map.rc.o
-grid_grid_RC = grid.rc.o
-guillotine_guillotine_RC = guillotine.rc.o
-hot_hot_RC = hot.rc.o
-jigsaw_jigsaw_RC = jigsaw.rc.o
-mail_mail_RC = mail.rc.o
-max_rgb_max_rgb_RC = max-rgb.rc.o
-newsprint_newsprint_RC = newsprint.rc.o
-nl_filter_nl_filter_RC = nl-filter.rc.o
-oilify_oilify_RC = oilify.rc.o
-photocopy_photocopy_RC = photocopy.rc.o
-plugin_browser_plugin_browser_RC = plugin-browser.rc.o
-procedure_browser_procedure_browser_RC = procedure-browser.rc.o
-qbist_qbist_RC = qbist.rc.o
-sample_colorize_sample_colorize_RC = sample-colorize.rc.o
-sharpen_sharpen_RC = sharpen.rc.o
-smooth_palette_smooth_palette_RC = smooth-palette.rc.o
-softglow_softglow_RC = softglow.rc.o
-sparkle_sparkle_RC = sparkle.rc.o
-sphere_designer_sphere_designer_RC = sphere-designer.rc.o
-tile_tile_RC = tile.rc.o
-tile_small_tile_small_RC = tile-small.rc.o
-unit_editor_unit_editor_RC = unit-editor.rc.o
-unsharp_mask_unsharp_mask_RC = unsharp-mask.rc.o
-van_gogh_lic_van_gogh_lic_RC = van-gogh-lic.rc.o
-warp_warp_RC = warp.rc.o
-wavelet_decompose_wavelet_decompose_RC = wavelet-decompose.rc.o
-web_browser_web_browser_RC = web-browser.rc.o
-web_page_web_page_RC = web-page.rc.o
+align_layers_RC = align-layers.rc.o
+animation_optimize_RC = animation-optimize.rc.o
+animation_play_RC = animation-play.rc.o
+blinds_RC = blinds.rc.o
+blur_RC = blur.rc.o
+border_average_RC = border-average.rc.o
+cartoon_RC = cartoon.rc.o
+checkerboard_RC = checkerboard.rc.o
+cml_explorer_RC = cml-explorer.rc.o
+color_cube_analyze_RC = color-cube-analyze.rc.o
+colorify_RC = colorify.rc.o
+colormap_remap_RC = colormap-remap.rc.o
+compose_RC = compose.rc.o
+contrast_normalize_RC = contrast-normalize.rc.o
+contrast_retinex_RC = contrast-retinex.rc.o
+crop_zealous_RC = crop-zealous.rc.o
+curve_bend_RC = curve-bend.rc.o
+decompose_RC = decompose.rc.o
+depth_merge_RC = depth-merge.rc.o
+despeckle_RC = despeckle.rc.o
+destripe_RC = destripe.rc.o
+edge_dog_RC = edge-dog.rc.o
+edge_neon_RC = edge-neon.rc.o
+emboss_RC = emboss.rc.o
+file_aa_RC = file-aa.rc.o
+file_cel_RC = file-cel.rc.o
+file_compressor_RC = file-compressor.rc.o
+file_csource_RC = file-csource.rc.o
+file_desktop_link_RC = file-desktop-link.rc.o
+file_dicom_RC = file-dicom.rc.o
+file_gbr_RC = file-gbr.rc.o
+file_gegl_RC = file-gegl.rc.o
+file_gif_load_RC = file-gif-load.rc.o
+file_gif_save_RC = file-gif-save.rc.o
+file_gih_RC = file-gih.rc.o
+file_glob_RC = file-glob.rc.o
+file_header_RC = file-header.rc.o
+file_heif_RC = file-heif.rc.o
+file_html_table_RC = file-html-table.rc.o
+file_jp2_load_RC = file-jp2-load.rc.o
+file_mng_RC = file-mng.rc.o
+file_pat_RC = file-pat.rc.o
+file_pcx_RC = file-pcx.rc.o
+file_pdf_load_RC = file-pdf-load.rc.o
+file_pdf_save_RC = file-pdf-save.rc.o
+file_pix_RC = file-pix.rc.o
+file_png_RC = file-png.rc.o
+file_pnm_RC = file-pnm.rc.o
+file_ps_RC = file-ps.rc.o
+file_psp_RC = file-psp.rc.o
+file_raw_data_RC = file-raw-data.rc.o
+file_sunras_RC = file-sunras.rc.o
+file_svg_RC = file-svg.rc.o
+file_tga_RC = file-tga.rc.o
+file_wmf_RC = file-wmf.rc.o
+file_xbm_RC = file-xbm.rc.o
+file_xmc_RC = file-xmc.rc.o
+file_xpm_RC = file-xpm.rc.o
+file_xwd_RC = file-xwd.rc.o
+film_RC = film.rc.o
+filter_pack_RC = filter-pack.rc.o
+fractal_trace_RC = fractal-trace.rc.o
+goat_exercise_RC = goat-exercise.rc.o
+gradient_map_RC = gradient-map.rc.o
+grid_RC = grid.rc.o
+guillotine_RC = guillotine.rc.o
+hot_RC = hot.rc.o
+jigsaw_RC = jigsaw.rc.o
+mail_RC = mail.rc.o
+max_rgb_RC = max-rgb.rc.o
+newsprint_RC = newsprint.rc.o
+nl_filter_RC = nl-filter.rc.o
+oilify_RC = oilify.rc.o
+photocopy_RC = photocopy.rc.o
+plugin_browser_RC = plugin-browser.rc.o
+procedure_browser_RC = procedure-browser.rc.o
+qbist_RC = qbist.rc.o
+sample_colorize_RC = sample-colorize.rc.o
+sharpen_RC = sharpen.rc.o
+smooth_palette_RC = smooth-palette.rc.o
+softglow_RC = softglow.rc.o
+sparkle_RC = sparkle.rc.o
+sphere_designer_RC = sphere-designer.rc.o
+tile_RC = tile.rc.o
+tile_small_RC = tile-small.rc.o
+unit_editor_RC = unit-editor.rc.o
+unsharp_mask_RC = unsharp-mask.rc.o
+van_gogh_lic_RC = van-gogh-lic.rc.o
+warp_RC = warp.rc.o
+wavelet_decompose_RC = wavelet-decompose.rc.o
+web_browser_RC = web-browser.rc.o
+web_page_RC = web-page.rc.o
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index 06d3a75..84aa00b 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -23,20 +23,20 @@ open RC, "> $outrc";
 
 require './plugin-defs.pl';
 
-$bins = ""; $opts = "";
+$bins = ""; $opts = ""; $dirs = "";
 
 foreach (sort keys %plugins) {
-    $bins .= "\t";
+    my $makename = $_;
+    $makename =~ s/-/_/g;
+
     if (exists $plugins{$_}->{optional}) {
-        my $makename = $_;
-        $makename =~ s/-/_/g;
-       $bins .= "\$(\U$makename\E)";
-       $opts .= "\t$_/$_ \\\n";
+       $bins .= "${makename}_libexec_PROGRAMS = \$(\U$makename\E)\n";
+       $opts .= "\t$_ \\\n";
     }
     else {
-       $bins .= "$_/$_";
+       $bins .= "${makename}_libexec_PROGRAMS = $_\n";
     }
-    $bins .= " \\\n";
+    $dirs .= "${makename}_libexecdir = \$(gimpplugindir)/plug-ins/$_\n";
 }
 
 $extra = "";
@@ -58,8 +58,6 @@ print MK <<EOT;
 ## Modify those two files instead of this one; for most
 ## plug-ins you should only need to modify plugin-defs.pl.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 if OS_WIN32
 mwindows = -mwindows
 else
@@ -88,8 +86,6 @@ libgimpwidgets = \$(top_builddir)/libgimpwidgets/libgimpwidgets-\$(GIMP_API_VERS
 
 AM_LDFLAGS = \$(mwindows)
 
-libexecdir = \$(gimpplugindir)/plug-ins
-
 EXTRA_DIST = \\
        mkgen.pl        \\
        plugin-defs.pl$extra    \\
@@ -101,7 +97,8 @@ AM_CPPFLAGS = \\
        \$(GEGL_CFLAGS) \\
        -I\$(includedir)
 
-nobase_libexec_PROGRAMS = \\
+$dirs
+
 $bins
 
 EXTRA_PROGRAMS = \\
@@ -173,7 +170,7 @@ foreach (sort keys %plugins) {
 
        print MK <<EOT;
 
-${makename}_${makename}_LDFLAGS = $ldflags
+${makename}_LDFLAGS = $ldflags
 EOT
     }
 
@@ -183,7 +180,7 @@ EOT
 
        print MK <<EOT;
 
-${makename}_${makename}_CFLAGS = $cflagsvalue
+${makename}_CFLAGS = $cflagsvalue
 EOT
     }
 
@@ -192,7 +189,7 @@ EOT
 
        print MK <<EOT;
 
-${makename}_${makename}_CPPFLAGS = $cppflags
+${makename}_CPPFLAGS = $cppflags
 EOT
     }
 
@@ -208,10 +205,10 @@ EOT
 
     print MK <<EOT;
 
-${makename}_${makename}_SOURCES = \\
+${makename}_SOURCES = \\
        $_.c
 
-${makename}_${makename}_LDADD = \\
+${makename}_LDADD = \\
        $libgimp                \\
        $glib$optlib
        $deplib         \\
@@ -219,7 +216,7 @@ ${makename}_${makename}_LDADD = \\
 EOT
 
      print RC <<EOT;
-${makename}_${makename}_RC = $_.rc.o
+${makename}_RC = $_.rc.o
 EOT
 
     print IGNORE "/$_\n";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]