mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-20 19:43:01 +00:00
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.
This commit is contained in:
parent
f2aa2c2726
commit
e9c387679b
4
plug-ins/common/.gitignore
vendored
4
plug-ins/common/.gitignore
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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' => {},
|
||||
|
|
Loading…
Reference in a new issue