[gimp] plug-ins: clean up pagecurl build, update .gitignore



commit 5ebc7909a3414ec94aa9c412e31673eb609a8f75
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jun 18 12:41:17 2018 +0200

    plug-ins: clean up pagecurl build, update .gitignore

 plug-ins/pagecurl/.gitignore  |  1 +
 plug-ins/pagecurl/Makefile.am | 28 ++++++++++++++++++----------
 plug-ins/pagecurl/pagecurl.c  |  2 --
 3 files changed, 19 insertions(+), 12 deletions(-)
---
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 '  </gresource>' >> $@; \
          echo '</gresources>' >> $@ )
 
-pagecurl-icons.c: pagecurl-icons.gresource.xml
+pagecurl-icons.h: pagecurl-icons.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
-         --sourcedir=$(srcdir) --generate-source \
+         --sourcedir=$(srcdir) --generate-header \
          --target=$@ pagecurl-icons.gresource.xml
 
-pagecurl-icons.h: pagecurl-icons.gresource.xml
+pagecurl-icons.c: pagecurl-icons.h
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
-         --sourcedir=$(srcdir) --generate-header \
+         --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"


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