From 8ad3fb0c2a9e0542235427f96f797c9bcf90d2b3 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 16 Oct 2009 12:59:39 -0500
Subject: Stealing these makefile segments to build enums and marshallers

---
 Makefile.am.enum | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Makefile.am.enum

(limited to 'Makefile.am.enum')

diff --git a/Makefile.am.enum b/Makefile.am.enum
new file mode 100644
index 0000000..208dee3
--- /dev/null
+++ b/Makefile.am.enum
@@ -0,0 +1,43 @@
+# Rules for generating enumeration types using glib-mkenums
+#
+# Define:
+# 	glib_enum_h = header template file
+# 	glib_enum_c = source template file
+# 	glib_enum_headers = list of headers to parse
+#
+# before including Makefile.am.enums. You will also need to have
+# the following targets already defined:
+#
+# 	CLEANFILES
+#	DISTCLEANFILES
+#	BUILT_SOURCES
+#	EXTRA_DIST
+#
+# Author: Emmanuele Bassi <ebassi@linux.intel.com>
+
+enum_tmpl_h=$(glib_enum_h:.h=.h.in)
+enum_tmpl_c=$(glib_enum_c:.c=.c.in)
+
+CLEANFILES += stamp-enum-types
+DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
+BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
+EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
+
+stamp-enum-types: $(glib_enum_headers)
+	$(QUIET_GEN)$(GLIB_MKENUMS) \
+		--template $(enum_tmpl_h) \
+	$(glib_enum_headers) > xgen-eh \
+	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
+	&& rm -f xgen-eh \
+	&& echo timestamp > $(@F)
+
+$(glib_enum_h): stamp-enum-types
+	@true
+
+$(glib_enum_c): $(glib_enum_h)
+	$(QUIET_GEN)$(GLIB_MKENUMS) \
+		--template $(enum_tmpl_c) \
+	$(glib_enum_headers) > xgen-ec \
+	&& cp -f xgen-ec $(glib_enum_c) \
+	&& rm -f xgen-ec
+
-- 
cgit v1.2.3


From f4f482c9f5a87ac7544e45f53f02117a50abf2d6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 16 Oct 2009 14:47:28 -0500
Subject: Some small changes to make 'distcheck' happy.

---
 Makefile.am.enum | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile.am.enum')

diff --git a/Makefile.am.enum b/Makefile.am.enum
index 208dee3..0f1a637 100644
--- a/Makefile.am.enum
+++ b/Makefile.am.enum
@@ -24,10 +24,11 @@ BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
 stamp-enum-types: $(glib_enum_headers)
+	mkdir -p `dirname $(builddir)/$(glib_enum_h)`
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(enum_tmpl_h) \
+		--template $(srcdir)/$(enum_tmpl_h) \
 	$(glib_enum_headers) > xgen-eh \
-	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
+	&& (cmp -s xgen-eh $(builddir)/$(glib_enum_h) || cp -f xgen-eh $(builddir)/$(glib_enum_h)) \
 	&& rm -f xgen-eh \
 	&& echo timestamp > $(@F)
 
@@ -35,9 +36,10 @@ $(glib_enum_h): stamp-enum-types
 	@true
 
 $(glib_enum_c): $(glib_enum_h)
+	mkdir -p `dirname $(builddir)/$(glib_enum_c)`
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(enum_tmpl_c) \
+		--template $(srcdir)/$(enum_tmpl_c) \
 	$(glib_enum_headers) > xgen-ec \
-	&& cp -f xgen-ec $(glib_enum_c) \
+	&& cp -f xgen-ec $(builddir)/$(glib_enum_c) \
 	&& rm -f xgen-ec
 
-- 
cgit v1.2.3


From 50e28fd237a7de7e3f28332711dc01c7fe8e4dbd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 16 Oct 2009 14:50:37 -0500
Subject: Adding the possibility of making the directories silently.

---
 Makefile.am.enum | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile.am.enum')

diff --git a/Makefile.am.enum b/Makefile.am.enum
index 0f1a637..0503de0 100644
--- a/Makefile.am.enum
+++ b/Makefile.am.enum
@@ -24,7 +24,7 @@ BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
 stamp-enum-types: $(glib_enum_headers)
-	mkdir -p `dirname $(builddir)/$(glib_enum_h)`
+	$(QUIET_GEN)mkdir -p `dirname $(builddir)/$(glib_enum_h)`
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
 		--template $(srcdir)/$(enum_tmpl_h) \
 	$(glib_enum_headers) > xgen-eh \
@@ -36,7 +36,7 @@ $(glib_enum_h): stamp-enum-types
 	@true
 
 $(glib_enum_c): $(glib_enum_h)
-	mkdir -p `dirname $(builddir)/$(glib_enum_c)`
+	$(QUIET_GEN)mkdir -p `dirname $(builddir)/$(glib_enum_c)`
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
 		--template $(srcdir)/$(enum_tmpl_c) \
 	$(glib_enum_headers) > xgen-ec \
-- 
cgit v1.2.3