summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hoover <karma@deadmoose.com>2004-10-27 18:35:21 +0000
committerDavid Hoover <dhoover@src.gnome.org>2004-10-27 18:35:21 +0000
commit8bbe96b0b0f7d877e4619cb3790633dfc0de3762 (patch)
tree2ab6ba89b90c8a21f657bcc79328546c14adaccf
parent80639c7c0df13c0d947d9f46eaafd329908b61d3 (diff)
downloadglade-8bbe96b0b0f7d877e4619cb3790633dfc0de3762.tar.gz
Fix up dependency issues with automatically generated marshallers files.
2004-10-27 David Hoover <karma@deadmoose.com> * src/Makefile.am: Fix up dependency issues with automatically generated marshallers files.
-rw-r--r--ChangeLog5
-rw-r--r--src/Makefile.am5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2fc721c..35c83c21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-27 David Hoover <karma@deadmoose.com>
+
+ * src/Makefile.am: Fix up dependency issues with automatically generated
+ marshallers files.
+
2004-10-26 Tristan Van Berkom <tristan.van.berkom@gmail.com>
* src/Makefile.am: CFLAGS was `-O2 -g', for now just `-g'. (Mixing
diff --git a/src/Makefile.am b/src/Makefile.am
index cac1745f..bcc72916 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,7 @@ glade_3_LDADD = \
BUILT_SOURCES = \
glade-marshallers.c \
glade-marshallers.h
+CLEANFILES = $(BUILT_SOURCES)
glade_3_SOURCES = \
main.c \
@@ -100,11 +101,11 @@ noinst_HEADERS = \
#
# Marshaller generation
#
-glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL)
+glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL) Makefile.am
$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \
&& mv glade-marshallers-h.tmp glade-marshallers.h \
|| ( rm -f glade-marshallers-h.tmp && exit 1)
-glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
+glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL) Makefile.am
$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp \
&& mv glade-marshallers-c.tmp glade-marshallers.c \
|| ( rm -f glade-marshallers-c.tmp && exit 1 )