GNOME.org
 

[gimp/gtk3-port: 438/444] plug-ins: install plug-ins in subfolder.

commit 80af4718f5605588baaf9955e5ee71455210a815
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.

 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 cf5bb53..4dc09ec 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 22533a1..5ad2b56 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 799ffc3..b528d6a 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 25f2b99..0ea58fe 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 9fd8667..55e6322 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 8676947..0bc5bbf 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 a094b94..b443475 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 171cfd0..d8f4f35 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 eb5b88b..934ae61 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 77fc3a0..2dd6a6f 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 6112bff..8969040 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 296c904..20bb79b 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 fa0f6a5..6b3e476 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 56e18a7..87031a4 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 bc86cc1..283ad92 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 653854c..9abe7e7 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 40e5840..5174815 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 2b9cdaa..e4f7a3b 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 8457c33..dbc3610 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 f9b6681..c111473 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 dd99c49..690840f 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 6328685..84fd386 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 8638291..f02568c 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 6513607..8133193 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 d5dd199..90e7fa4 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 b2a294f..fed7f8e 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 debb488..787b042 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 4db7705..46ad336 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 b788ba4..e27d85e 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 094769d..64c0a9e 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]