Issue #4201: meson: pdbgen not working.

Fix the dependency by making the stamp an actual (yet empty/no-op)
header file which is included by all generated source file. This way, we
ensure that meson rebuild .o files when the .pdb sources are changed.

This is the second solution proposed by eli-schwartz here:
https://github.com/mesonbuild/meson/issues/10196#issuecomment-1080053413
This commit is contained in:
Jehan 2022-03-28 15:13:17 +02:00
parent 10afff9319
commit f9cf16f46f
111 changed files with 222 additions and 9 deletions

View File

@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/app \ -I$(top_builddir)/app \
-I$(top_builddir)/pdb \
-I$(top_srcdir)/app \ -I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \ $(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \ $(GEGL_CFLAGS) \

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <string.h> #include <string.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <glib-object.h> #include <glib-object.h>
#include "pdb-types.h" #include "pdb-types.h"

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <string.h> #include <string.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <cairo.h> #include <cairo.h>
#include <gegl.h> #include <gegl.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

View File

@ -19,6 +19,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include <string.h> #include <string.h>
#include <gegl.h> #include <gegl.h>

View File

@ -74,6 +74,7 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimp\" \ -DG_LOG_DOMAIN=\"LibGimp\" \
-DGIMP_COMPILATION \ -DGIMP_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/pdb \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(GEGL_CFLAGS) \ $(GEGL_CFLAGS) \
$(GEXIV2_CFLAGS) \ $(GEXIV2_CFLAGS) \

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"
#include "gimppdb_pdb.h" #include "gimppdb_pdb.h"

View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include "stamp-pdbgen.h"
#include "gimp.h" #include "gimp.h"
#include "gimpplugin_pdb.h" #include "gimpplugin_pdb.h"

Some files were not shown because too many files have changed in this diff Show More