[gegl-gtk] operations: Add gegl-gtk$version- prefix to installed plugins



commit 61d95fed3c78b668be16e3a4c93dd9e628082787
Author: Jon Nordby <jononor gmail com>
Date:   Mon Jun 27 18:46:41 2011 +0200

    operations: Add gegl-gtk$version- prefix to installed plugins
    
    This makes sure there are no conflicts with other plugins.

 operations/Makefile.am                           |    6 +++---
 operations/{gtk-display.c => gegl-gtk-display.c} |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/operations/Makefile.am b/operations/Makefile.am
index 35e21e2..985baa5 100644
--- a/operations/Makefile.am
+++ b/operations/Makefile.am
@@ -6,8 +6,8 @@ CFLAGS			= $(GTK_CFLAGS) $(GEGL_CFLAGS)
 LDFLAGS			= -avoid-version -export-dynamic -module
 
 CFILES          = $(wildcard $(srcdir)/*.c)
-plugins         = $(subst $(srcdir)/,,$(CFILES:.c=.la))
-INSTALLED_ITEMS = $(subst $(srcdir)/,$(ext_dir)/,$(CFILES:.c=$(SHREXT)))
+plugins         = $(subst gegl-gtk-,gegl-gtk GEGL_GTK_GTK_VERSION@-, $(subst $(srcdir)/,,$(CFILES:.c=.la)))
+INSTALLED_ITEMS = $(subst gegl-gtk-,gegl-gtk GEGL_GTK_GTK_VERSION@-, $(subst $(srcdir)/,$(ext_dir)/,$(CFILES:.c=$(SHREXT))))
 EXTRA_DIST      = $(wildcard *.c) $(wildcard *.h)
 
 gegl_lt_cc_v = $(gegl_lt_cc_v_$(V))
@@ -19,7 +19,7 @@ gegl_lt_ccld_v_0 = @echo "  CCLD   " $@;
 
 all-local: $(plugins)
 
-%.la: %.c
+gegl-gtk GEGL_GTK_GTK_VERSION@-%.la: gegl-gtk-%.c
 	$(gegl_lt_cc_v) $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) -I$(srcdir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $<
 	$(gegl_lt_ccld_v) $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ -rpath $(ext_dir) $  lo $(LIBS) $(MATH_LIB)
 
diff --git a/operations/gtk-display.c b/operations/gegl-gtk-display.c
similarity index 99%
rename from operations/gtk-display.c
rename to operations/gegl-gtk-display.c
index 3162496..fabcf9f 100644
--- a/operations/gtk-display.c
+++ b/operations/gegl-gtk-display.c
@@ -28,7 +28,7 @@ gegl_chant_string  (window_title, _("Window Title"), "",
 #else
 
 #define GEGL_CHANT_TYPE_SINK
-#define GEGL_CHANT_C_FILE       "gtk-display.c"
+#define GEGL_CHANT_C_FILE       "gegl-gtk-display.c"
 
 #include <gegl.h>
 #include <gegl-chant.h>



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