GNOME.org
 

[gimp/gtk3-port: 439/457] plug-ins: make plug-ins inside common/ to also install in subfolders.

commit 3bf32c294749bab1cc47c38c0c857129ad425607
Author: Jehan <jehan girinstud io>
Date:   Sun May 13 01:01:41 2018 +0200

    plug-ins: make plug-ins inside common/ to also install in subfolders.

 plug-ins/common/Makefile.am |  282 ++++++++++++++++++++++++++++---------------
 plug-ins/common/mkgen.pl    |   20 ++--
 2 files changed, 197 insertions(+), 105 deletions(-)
---
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 193ab51..eccf0e9 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -35,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  \
@@ -48,99 +46,193 @@ AM_CPPFLAGS = \
        $(GEGL_CFLAGS)  \
        -I$(includedir)
 
-libexec_PROGRAMS = \
-       align-layers \
-       animation-optimize \
-##     animation-play \
-       blinds \
-       blur \
-       border-average \
-       cartoon \
-       checkerboard \
-       cml-explorer \
-       color-cube-analyze \
-       colorify \
-       colormap-remap \
-       compose \
-       contrast-normalize \
-       contrast-retinex \
-       crop-zealous \
-##     curve-bend \
-       decompose \
-       depth-merge \
-       despeckle \
-       destripe \
-       edge-dog \
-       edge-neon \
-       emboss \
-       $(FILE_AA) \
-       file-cel \
-       file-compressor \
-       file-csource \
-       file-desktop-link \
-       file-dicom \
-       file-gbr \
-       file-gegl \
-       file-gif-load \
-       file-gif-save \
-       file-gih \
-       file-glob \
-       file-header \
-       $(FILE_HEIF) \
-       file-html-table \
-       $(FILE_JP2_LOAD) \
-       $(FILE_MNG) \
-       file-pat \
-       file-pcx \
-       file-pdf-load \
-       $(FILE_PDF_SAVE) \
-       file-pix \
-       file-png \
-       file-pnm \
-       $(FILE_PS) \
-       file-psp \
-       file-raw-data \
-       file-sunras \
-       file-svg \
-       file-tga \
-       $(FILE_WMF) \
-       file-xbm \
-       $(FILE_XMC) \
-       $(FILE_XPM) \
-       file-xwd \
-       film \
-       filter-pack \
-       fractal-trace \
-       goat-exercise \
-       gradient-map \
-       grid \
-       guillotine \
-       hot \
-       jigsaw \
-       $(MAIL) \
-       max-rgb \
-       newsprint \
-       nl-filter \
-       oilify \
-       photocopy \
-       plugin-browser \
-       procedure-browser \
-       qbist \
-       sample-colorize \
-       sharpen \
-       smooth-palette \
-       softglow \
-       sparkle \
-       sphere-designer \
-       tile \
-       tile-small \
-       unit-editor \
-       unsharp-mask \
-       van-gogh-lic \
-       warp \
-       wavelet-decompose \
-       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 \
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index 90f66d4..1560ef4 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -23,20 +23,21 @@ 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)";
+       $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 = "";
@@ -86,8 +87,6 @@ libgimpwidgets = \$(top_builddir)/libgimpwidgets/libgimpwidgets-\$(GIMP_API_VERS
 
 AM_LDFLAGS = \$(mwindows)
 
-libexecdir = \$(gimpplugindir)/plug-ins
-
 EXTRA_DIST = \\
        mkgen.pl        \\
        plugin-defs.pl$extra    \\
@@ -99,7 +98,8 @@ AM_CPPFLAGS = \\
        \$(GEGL_CFLAGS) \\
        -I\$(includedir)
 
-libexec_PROGRAMS = \\
+$dirs
+
 $bins
 
 EXTRA_PROGRAMS = \\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]