[gnome-builder] build: fix dist-check



commit 6aba79946cf6db7e3ab56fbec16989fe6956aba0
Author: Christian Hergert <christian hergert me>
Date:   Sun Sep 21 21:10:47 2014 -0700

    build: fix dist-check

 Makefile.am          |    4 ++++
 src/gnome-builder.mk |   21 +++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2fa4457..2aade1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,7 @@ include data/data.mk
 # XXX: Not happy about this, need to come up with a good way to do
 # icon installation that doesn't require subdirs.
 SUBDIRS = . data/icons tests
+
+EXTRA_DIST += \
+       tap-driver.sh \
+       tap-test
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index 36c8ece..4610b59 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -1,9 +1,5 @@
 bin_PROGRAMS += gnome-builder
 
-BUILT_FILES = \
-       src/resources/gb-resources.c \
-       src/resources/gb-resources.h
-
 gnome_builder_SOURCES = \
        $(BUILT_FILES) \
        src/animation/gb-animation.c \
@@ -144,14 +140,27 @@ endif
 
 # XXX: Workaround for now, need to find a more automated way to do this
 # in how we build projects inside of Builder.
-src/app/gnome_builder-gb-application.$(OBJEXT): $(BUILT_FILES)
+gnome_builder_built_sources = \
+       src/resources/gb-resources.c \
+       src/resources/gb-resources.h
+
+BUILT_SOURCES = \
+       $(gnome_builder_built_sources) \
+       $(NULL)
 
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir)/src/resources --generate-dependencies 
$(top_srcdir)/src/resources/gnome-builder.gresource.xml)
+# src/app/gnome_builder-gb-application.$(OBJEXT): $(gnome_builder_built_sources)
+
+resource_files = $(shell glib-compile-resources --sourcedir=$(top_srcdir)/src/resources 
--generate-dependencies $(top_srcdir)/src/resources/gnome-builder.gresource.xml)
 src/resources/gb-resources.c: src/resources/gnome-builder.gresource.xml $(resource_files)
        $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/src/resources 
--generate-source --c-name gb $(top_srcdir)/src/resources/gnome-builder.gresource.xml
 src/resources/gb-resources.h: src/resources/gnome-builder.gresource.xml $(resource_files)
        $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/src/resources 
--generate-header --c-name gb $(top_srcdir)/src/resources/gnome-builder.gresource.xml
 
+nodist_gnome_builder_SOURCES = \
+       $(gnome_builder_built_sources) \
+       $(NULL)
+
 EXTRA_DIST += $(resource_files)
 EXTRA_DIST += src/resources/gnome-builder.gresource.xml
 
+CLEANFILES += $(BUILT_SOURCES)


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