GNOME.org
 

[gimp/gimp-2-10] plug-ins: install plug-ins in subfolder.

commit 79961a654559e06cd853a4337bd1e97e963ec080
Author: Jehan <jehan girinstud io>
Date:   Sat May 12 00:28:05 2018 +0200

    plug-ins: install plug-ins in subfolder.
    
    I am going to forbid plug-ins from being installed directly in the root
    of the plug-ins/ directory. They will have to be installed in a
    subdirectory named the same as the entry point binary.
    This may seem useless for our core plug-ins which are nearly all
    self-contained in single binaries, but this is actually a necessary
    restriction to eliminate totally the DLL hell issue on Windows. Moving
    core plug-ins in subfolders is only a necessary consequence for it.
    
    (cherry picked from commit 870ca6334d79b421811e5ecd817883a5cff2673a)

 plug-ins/file-bmp/Makefile.am          |  2 +-
 plug-ins/file-exr/Makefile.am          |  2 +-
 plug-ins/file-faxg3/Makefile.am        |  2 +-
 plug-ins/file-fits/Makefile.am         |  2 +-
 plug-ins/file-fli/Makefile.am          |  2 +-
 plug-ins/file-ico/Makefile.am          |  2 +-
 plug-ins/file-jpeg/Makefile.am         |  2 +-
 plug-ins/file-psd/Makefile.am          |  2 +-
 plug-ins/file-raw/Makefile.am          | 11 ++++++-----
 plug-ins/file-sgi/Makefile.am          |  2 +-
 plug-ins/file-tiff/Makefile.am         |  2 +-
 plug-ins/file-webp/Makefile.am         |  2 +-
 plug-ins/flame/Makefile.am             |  2 +-
 plug-ins/fractal-explorer/Makefile.am  |  2 +-
 plug-ins/gfig/Makefile.am              |  2 +-
 plug-ins/gimpressionist/Makefile.am    |  2 +-
 plug-ins/gradient-flare/Makefile.am    |  2 +-
 plug-ins/help-browser/Makefile.am      |  2 +-
 plug-ins/help/Makefile.am              |  2 +-
 plug-ins/ifs-compose/Makefile.am       |  2 +-
 plug-ins/imagemap/Makefile.am          |  2 +-
 plug-ins/lighting/Makefile.am          |  2 +-
 plug-ins/map-object/Makefile.am        |  2 +-
 plug-ins/metadata/Makefile.am          |  8 ++++----
 plug-ins/pagecurl/Makefile.am          |  2 +-
 plug-ins/print/Makefile.am             |  2 +-
 plug-ins/screenshot/Makefile.am        |  2 +-
 plug-ins/script-fu/Makefile.am         |  2 +-
 plug-ins/selection-to-path/Makefile.am |  2 +-
 plug-ins/twain/Makefile.am             |  2 +-
 30 files changed, 38 insertions(+), 37 deletions(-)
---
diff --git a/plug-ins/file-bmp/Makefile.am b/plug-ins/file-bmp/Makefile.am
index cf5bb53a05..4dc09ec1c8 100644
--- a/plug-ins/file-bmp/Makefile.am
+++ b/plug-ins/file-bmp/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-bmp
 
 libexec_PROGRAMS = file-bmp
 
diff --git a/plug-ins/file-exr/Makefile.am b/plug-ins/file-exr/Makefile.am
index 22533a1628..5ad2b56659 100644
--- a/plug-ins/file-exr/Makefile.am
+++ b/plug-ins/file-exr/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-exr
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)   \
diff --git a/plug-ins/file-faxg3/Makefile.am b/plug-ins/file-faxg3/Makefile.am
index 799ffc35a7..b528d6a401 100644
--- a/plug-ins/file-faxg3/Makefile.am
+++ b/plug-ins/file-faxg3/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-faxg3
 
 libexec_PROGRAMS = file-faxg3
 
diff --git a/plug-ins/file-fits/Makefile.am b/plug-ins/file-fits/Makefile.am
index 25f2b99d6d..0ea58fea99 100644
--- a/plug-ins/file-fits/Makefile.am
+++ b/plug-ins/file-fits/Makefile.am
@@ -20,7 +20,7 @@ endif
 AM_LDFLAGS = $(mwindows)
 AM_CFLAGS = -fno-strict-aliasing
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-fits
 
 libexec_PROGRAMS = file-fits
 
diff --git a/plug-ins/file-fli/Makefile.am b/plug-ins/file-fli/Makefile.am
index 9fd8667607..55e63229cd 100644
--- a/plug-ins/file-fli/Makefile.am
+++ b/plug-ins/file-fli/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-fli
 
 libexec_PROGRAMS = file-fli
 
diff --git a/plug-ins/file-ico/Makefile.am b/plug-ins/file-ico/Makefile.am
index 867694747a..0bc5bbfd2d 100644
--- a/plug-ins/file-ico/Makefile.am
+++ b/plug-ins/file-ico/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-ico
 
 libexec_PROGRAMS = file-ico
 
diff --git a/plug-ins/file-jpeg/Makefile.am b/plug-ins/file-jpeg/Makefile.am
index a094b94d43..b4434750b7 100644
--- a/plug-ins/file-jpeg/Makefile.am
+++ b/plug-ins/file-jpeg/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-jpeg
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)         \
diff --git a/plug-ins/file-psd/Makefile.am b/plug-ins/file-psd/Makefile.am
index 171cfd05df..d8f4f3577e 100644
--- a/plug-ins/file-psd/Makefile.am
+++ b/plug-ins/file-psd/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-psd
 
 libexec_PROGRAMS = \
        file-psd
diff --git a/plug-ins/file-raw/Makefile.am b/plug-ins/file-raw/Makefile.am
index eb5b88b8d4..934ae6187a 100644
--- a/plug-ins/file-raw/Makefile.am
+++ b/plug-ins/file-raw/Makefile.am
@@ -20,7 +20,9 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+dt_libexecdir = $(gimpplugindir)/plug-ins/file-darktable
+rt_libexecdir = $(gimpplugindir)/plug-ins/file-rawtherapee
+rp_libexecdir = $(gimpplugindir)/plug-ins/file-raw-placeholder
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
@@ -28,10 +30,9 @@ AM_CPPFLAGS = \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS)
 
-libexec_PROGRAMS = \
-       file-darktable          \
-       file-rawtherapee        \
-       file-raw-placeholder
+dt_libexec_PROGRAMS = file-darktable
+rt_libexec_PROGRAMS = file-rawtherapee
+rp_libexec_PROGRAMS = file-raw-placeholder
 
 file_darktable_SOURCES = \
        file-darktable.c        \
diff --git a/plug-ins/file-sgi/Makefile.am b/plug-ins/file-sgi/Makefile.am
index 77fc3a0139..2dd6a6f303 100644
--- a/plug-ins/file-sgi/Makefile.am
+++ b/plug-ins/file-sgi/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-sgi
 
 libexec_PROGRAMS = file-sgi
 
diff --git a/plug-ins/file-tiff/Makefile.am b/plug-ins/file-tiff/Makefile.am
index 6112bff13f..8969040675 100644
--- a/plug-ins/file-tiff/Makefile.am
+++ b/plug-ins/file-tiff/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-tiff
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)         \
diff --git a/plug-ins/file-webp/Makefile.am b/plug-ins/file-webp/Makefile.am
index 296c904273..20bb79b3b9 100644
--- a/plug-ins/file-webp/Makefile.am
+++ b/plug-ins/file-webp/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/file-webp
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)         \
diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am
index fa0f6a56b1..6b3e4763b0 100644
--- a/plug-ins/flame/Makefile.am
+++ b/plug-ins/flame/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/flame
 
 libexec_PROGRAMS = flame
 
diff --git a/plug-ins/fractal-explorer/Makefile.am b/plug-ins/fractal-explorer/Makefile.am
index 56e18a73b4..87031a4358 100644
--- a/plug-ins/fractal-explorer/Makefile.am
+++ b/plug-ins/fractal-explorer/Makefile.am
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(mwindows)
 
 SUBDIRS = examples
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/fractal-explorer
 
 libexec_PROGRAMS = fractal-explorer
 
diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am
index bc86cc17d7..283ad92cf1 100644
--- a/plug-ins/gfig/Makefile.am
+++ b/plug-ins/gfig/Makefile.am
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(mwindows)
 
 SUBDIRS = gfig-examples images
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/gfig
 
 libexec_PROGRAMS = gfig
 
diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am
index 653854c66d..9abe7e79c3 100644
--- a/plug-ins/gimpressionist/Makefile.am
+++ b/plug-ins/gimpressionist/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS = \
 AM_LDFLAGS = $(mwindows)
 
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/gimpressionist
 
 libexec_PROGRAMS = gimpressionist
 
diff --git a/plug-ins/gradient-flare/Makefile.am b/plug-ins/gradient-flare/Makefile.am
index 40e5840c06..5174815510 100644
--- a/plug-ins/gradient-flare/Makefile.am
+++ b/plug-ins/gradient-flare/Makefile.am
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(mwindows)
 
 SUBDIRS = flares
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/gradient-flare
 
 libexec_PROGRAMS = gradient-flare
 
diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am
index 2b9cdaa9f9..e4f7a3b5f5 100644
--- a/plug-ins/help-browser/Makefile.am
+++ b/plug-ins/help-browser/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/help-browser
 
 libexec_PROGRAMS = help-browser
 
diff --git a/plug-ins/help/Makefile.am b/plug-ins/help/Makefile.am
index 8457c33055..dbc36108e6 100644
--- a/plug-ins/help/Makefile.am
+++ b/plug-ins/help/Makefile.am
@@ -43,7 +43,7 @@ libgimphelp_a_SOURCES = \
        gimphelpprogress.h      \
        gimphelpprogress-private.h
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/help
 
 libexec_PROGRAMS = help
 
diff --git a/plug-ins/ifs-compose/Makefile.am b/plug-ins/ifs-compose/Makefile.am
index f9b6681c51..c11147313d 100644
--- a/plug-ins/ifs-compose/Makefile.am
+++ b/plug-ins/ifs-compose/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/ifs-compose
 
 libexec_PROGRAMS = ifs-compose
 
diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am
index 018a95942a..99f07552ff 100644
--- a/plug-ins/imagemap/Makefile.am
+++ b/plug-ins/imagemap/Makefile.am
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(mwindows)
 
 SUBDIRS = images
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/imagemap
 
 libexec_PROGRAMS = imagemap
 
diff --git a/plug-ins/lighting/Makefile.am b/plug-ins/lighting/Makefile.am
index 632868590b..84fd386324 100644
--- a/plug-ins/lighting/Makefile.am
+++ b/plug-ins/lighting/Makefile.am
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(mwindows)
 
 SUBDIRS = images
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/lighting
 
 libexec_PROGRAMS = lighting
 
diff --git a/plug-ins/map-object/Makefile.am b/plug-ins/map-object/Makefile.am
index 863829135c..f02568cbcf 100644
--- a/plug-ins/map-object/Makefile.am
+++ b/plug-ins/map-object/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/map-object
 
 libexec_PROGRAMS = map-object
 
diff --git a/plug-ins/metadata/Makefile.am b/plug-ins/metadata/Makefile.am
index 6513607a89..8133193f7d 100644
--- a/plug-ins/metadata/Makefile.am
+++ b/plug-ins/metadata/Makefile.am
@@ -22,11 +22,11 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+me_libexecdir = $(gimpplugindir)/plug-ins/metadata-editor
+mv_libexecdir = $(gimpplugindir)/plug-ins/metadata-viewer
 
-libexec_PROGRAMS = \
-       metadata-editor         \
-       metadata-viewer
+me_libexec_PROGRAMS = metadata-editor
+mv_libexec_PROGRAMS = metadata-viewer
 
 metadata_editor_SOURCES = \
        metadata-editor.c       \
diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am
index d9f5eda8da..4640fe0cc3 100644
--- a/plug-ins/pagecurl/Makefile.am
+++ b/plug-ins/pagecurl/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/pagecurl
 
 libexec_PROGRAMS = pagecurl
 
diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am
index b2a294f285..fed7f8ef44 100644
--- a/plug-ins/print/Makefile.am
+++ b/plug-ins/print/Makefile.am
@@ -39,7 +39,7 @@ LDADD = \
        $(INTLLIBS)             \
        $(print_RC)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/print
 
 libexec_PROGRAMS = print
 
diff --git a/plug-ins/screenshot/Makefile.am b/plug-ins/screenshot/Makefile.am
index 3db35e7686..0d8d829f21 100644
--- a/plug-ins/screenshot/Makefile.am
+++ b/plug-ins/screenshot/Makefile.am
@@ -37,7 +37,7 @@ LDADD = \
        $(INTLLIBS)             \
        $(screenshot_RC)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/screenshot
 
 libexec_PROGRAMS = screenshot
 
diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am
index 4db770575f..46ad336588 100644
--- a/plug-ins/script-fu/Makefile.am
+++ b/plug-ins/script-fu/Makefile.am
@@ -53,7 +53,7 @@ AM_LDFLAGS = \
 SUBDIRS = tinyscheme ftx scripts
 
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/script-fu
 
 libexec_PROGRAMS = script-fu
 
diff --git a/plug-ins/selection-to-path/Makefile.am b/plug-ins/selection-to-path/Makefile.am
index b788ba445d..e27d85e7c0 100644
--- a/plug-ins/selection-to-path/Makefile.am
+++ b/plug-ins/selection-to-path/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/selection-to-path
 
 libexec_PROGRAMS = selection-to-path
 
diff --git a/plug-ins/twain/Makefile.am b/plug-ins/twain/Makefile.am
index 094769de05..64c0a9e42f 100644
--- a/plug-ins/twain/Makefile.am
+++ b/plug-ins/twain/Makefile.am
@@ -8,7 +8,7 @@ libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
 libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
 libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
 
-libexecdir = $(gimpplugindir)/plug-ins
+libexecdir = $(gimpplugindir)/plug-ins/twain
 
 libexec_PROGRAMS = twain
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]