[gimp/goat-invasion: 206/608] plug-ins: fix mkgen.pl to pass the destdir newly required by make_file()

[Michael Natterer <mitch src gnome org>]

commit 03ea894fab3abe33410a146919e3e1c3f15d3969
Author: Michael Natterer <mitch gimp org>
Date:   Thu Mar 22 11:46:09 2012 +0100

    plug-ins: fix mkgen.pl to pass the destdir newly required by make_file()
    
    Also, add support for "gegl => 1" in plugin-degs.pl and regenerated
    all build files.

 plug-ins/common/.gitignore     |    4 ++--
 plug-ins/common/Makefile.am    |   32 ++++++++++++++++----------------
 plug-ins/common/gimprc.common  |    2 +-
 plug-ins/common/mkgen.pl       |   20 ++++++++++++++------
 plug-ins/common/plugin-defs.pl |    2 +-
 5 files changed, 34 insertions(+), 26 deletions(-)
---
diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore
index 7eb54e0..fae193e 100644
--- a/plug-ins/common/.gitignore
+++ b/plug-ins/common/.gitignore
@@ -100,8 +100,6 @@
 /file-aa.exe
 /file-cel
 /file-cel.exe
-/file-compressor
-/file-compressor.exe
 /file-csource
 /file-csource.exe
 /file-desktop-link
@@ -172,6 +170,8 @@
 /filter-pack.exe
 /fractal-trace
 /fractal-trace.exe
+/goat-exercise
+/goat-exercise.exe
 /gradient-map
 /gradient-map.exe
 /grid
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index aafbbdd..f05cd8c 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -1655,6 +1655,22 @@ fractal_trace_LDADD = \
 	$(INTLLIBS)		\
 	$(fractal_trace_RC)
 
+goat_exercise_SOURCES = \
+	goat-exercise.c
+
+goat_exercise_LDADD = \
+	$(libgimp)		\
+	$(libgimpmath)		\
+	$(libgimpconfig)	\
+	$(libgimpcolor)		\
+	$(libgimpbase)		\
+	$(CAIRO_LIBS)		\
+	$(GDK_PIXBUF_LIBS)	\
+	$(GEGL_LIBS)		\
+	$(RT_LIBS)		\
+	$(INTLLIBS)		\
+	$(goat_exercise_RC)
+
 gradient_map_SOURCES = \
 	gradient-map.c
 
@@ -2265,22 +2281,6 @@ semi_flatten_LDADD = \
 	$(INTLLIBS)		\
 	$(semi_flatten_RC)
 
-
-goat_exercise_SOURCES = \
-	goat-exercise.c
-
-goat_exercise_LDADD = \
-	$(libgimp)		\
-	$(libgimpmath)		\
-	$(libgimpconfig)	\
-	$(libgimpcolor)		\
-	$(libgimpbase)		\
-	$(CAIRO_LIBS)		\
-	$(GDK_PIXBUF_LIBS)	\
-	$(RT_LIBS)		\
-	$(INTLLIBS)		\
-	$(goat_excercise_RC)
-
 sharpen_SOURCES = \
 	sharpen.c
 
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index 42e5e4f..2fa03e7 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -47,7 +47,6 @@ emboss_RC = emboss.rc.o
 engrave_RC = engrave.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
@@ -83,6 +82,7 @@ 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
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index 060e741..e890190 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -7,12 +7,15 @@ require 'util.pl';
 *write_file = \&Gimp::CodeGen::util::write_file;
 *FILE_EXT   = \$Gimp::CodeGen::util::FILE_EXT;
 
+$destdir = ".";
+$builddir = ".";
+
 $ignorefile = ".gitignore";
 $rcfile     = "gimprc.common";
 
-$outmk = "Makefile.am$FILE_EXT";
-$outignore = "$ignorefile$FILE_EXT";
-$outrc = "$rcfile$FILE_EXT";
+$outmk = "$builddir/Makefile.am$FILE_EXT";
+$outignore = "$builddir/$ignorefile$FILE_EXT";
+$outrc = "$builddir/$rcfile$FILE_EXT";
 
 open MK, "> $outmk";
 open IGNORE, "> $outignore";
@@ -88,6 +91,7 @@ EXTRA_DIST = \\
 INCLUDES = \\
 	-I\$(top_srcdir)	\\
 	\$(GTK_CFLAGS)	\\
+	\$(GEGL_CFLAGS)	\\
 	-I\$(includedir)
 
 libexec_PROGRAMS = \\
@@ -142,6 +146,10 @@ foreach (sort keys %plugins) {
 	$glib = "\$(CAIRO_LIBS)\t\t\\\n\t\$(GDK_PIXBUF_LIBS)\t\\"
     }
 
+    if (exists $plugins{$_}->{gegl}) {
+	$glib .= "\n\t\$(GEGL_LIBS)\t\t\\";
+    }
+
     my $optlib = "";
 
     if (exists $plugins{$_}->{optional}) {
@@ -194,7 +202,7 @@ close RC;
 close MK;
 close IGNORE;
 
-&write_file($outmk);
-&write_file($outignore);
-&write_file($outrc);
+&write_file($outmk, $destdir);
+&write_file($outignore, $destdir);
+&write_file($outrc, $destdir);
 
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 03e9422..7464676 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -83,7 +83,7 @@
     'film' => { ui => 1 },
     'filter-pack' => { ui => 1 },
     'fractal-trace' => { ui => 1 },
-    'goat-exercise' => {},
+    'goat-exercise' => { gegl => 1 },
     'gradient-map' => {},
     'grid' => { ui => 1 },
     'guillotine' => {},