diff --git a/plug-ins/pagecurl/.gitignore b/plug-ins/pagecurl/.gitignore index a83f494388..63f6e3e4d7 100644 --- a/plug-ins/pagecurl/.gitignore +++ b/plug-ins/pagecurl/.gitignore @@ -6,4 +6,5 @@ /pagecurl /pagecurl.exe /pagecurl-icons.c +/pagecurl-icons.h /pagecurl-icons.gresource.xml diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am index 953b69998e..7daa7bce01 100644 --- a/plug-ins/pagecurl/Makefile.am +++ b/plug-ins/pagecurl/Makefile.am @@ -25,16 +25,18 @@ libexecdir = $(gimpplugindir)/plug-ins/pagecurl libexec_PROGRAMS = pagecurl -pagecurl_SOURCES = pagecurl.c - -BUILT_SOURCES = \ - pagecurl-icons.c \ +pagecurl_built_sources = \ + pagecurl-icons.c \ pagecurl-icons.h +pagecurl_SOURCES = \ + $(pagecurl_built_sources) \ + pagecurl.c + AM_CPPFLAGS = \ -I$(top_srcdir) \ $(GTK_CFLAGS) \ - $(GEGL_CFLAGS) \ + $(GEGL_CFLAGS) \ -I$(includedir) LDADD = \ @@ -65,7 +67,13 @@ PAGECURL_IMAGES = \ EXTRA_DIST = $(PAGECURL_IMAGES) -CLEANFILES = $(BUILT_SOURCES) pagecurl-icons.gresource.xml +gen_sources = \ + pagecurl-icons.c \ + pagecurl-icons.h + +CLEANFILES = \ + $(gen_sources) \ + pagecurl-icons.gresource.xml pagecurl-icons.gresource.xml: $(PAGECURL_IMAGES) Makefile.am $(AM_V_GEN) ( rm -f $@; \ @@ -78,12 +86,12 @@ pagecurl-icons.gresource.xml: $(PAGECURL_IMAGES) Makefile.am echo ' ' >> $@; \ echo '' >> $@ ) -pagecurl-icons.c: pagecurl-icons.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \ - --sourcedir=$(srcdir) --generate-source \ - --target=$@ pagecurl-icons.gresource.xml - pagecurl-icons.h: pagecurl-icons.gresource.xml $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \ --sourcedir=$(srcdir) --generate-header \ --target=$@ pagecurl-icons.gresource.xml + +pagecurl-icons.c: pagecurl-icons.h + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \ + --sourcedir=$(srcdir) --generate-source \ + --target=$@ pagecurl-icons.gresource.xml diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index f2e9dde41b..44bdb49f08 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -47,8 +47,6 @@ #include "libgimp/stdplugins-intl.h" -#include "pagecurl-icons.h" - #define PLUG_IN_PROC "plug-in-pagecurl" #define PLUG_IN_BINARY "pagecurl"