Merge lp:~bratsche/libgrope/enum-type-generation into lp:libgrope

[Cody Russell]

[Stephen M. Webb (bregma)]

Look good.

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-10-12 15:42:04 +0000
+++ src/Makefile.am	2010-11-09 23:16:03 +0000
@@ -1,7 +1,31 @@
+grope_built_public_sources =		\
+	gropetypebuiltins.h
+
+stamp_files =				\
+	gropetypebuiltins.h		\
+	gropetypebuiltins.c
+
 sources_h =				\
 	gropegesturemanager.h		\
 	grope.h
 
+EXTRA_DIST =				\
+	gropetypebuiltins.h.in		\
+	gropetypebuiltins.c.in
+
+gropetypebuiltins.h: stamp-gropetypebuiltins.h
+
+stamp-gropetypebuiltins.h: $(sources_h)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template gropetypebuiltins.h.in			\
+	  $(sources_h) ) >> xgen-gtbh								\
+	  && (cmp -s xgen-gtbh gropetypebuiltins.h || cp xgen-gtbh gropetypebuiltins.h )	\
+	  && rm -f xgen-gtbh && echo timestamp > $(@F)
+
+gropetypebuiltins.c: stamp-gropetypebuiltins.h
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template gropetypebuiltins.c.in			\
+	  $(sources_h) ) > xgen-gtbc								\
+	&& cp xgen-gtbc gropetypebuiltins.c && rm -f xgen-gtbc
+
 INCLUDES =				\
 	-I$(srcdir)			\
 	-I$(top_srcdir)			\
@@ -22,7 +46,8 @@
 lib_LTLIBRARIES = libgrope-0.1.la
 
 libgrope_0_1_la_SOURCES =		\
-	gropegesturemanager.c
+	gropegesturemanager.c		\
+	gropetypebuiltins.c
 
 libgropeincludedir=$(includedir)/libgrope-0.1/libgrope
 
@@ -34,3 +59,8 @@
 libgrope_0_1_la_LDFLAGS = $(GTK_LT_LDFLAGS)
 
 gropeheadersdir = $(includedir)/grope-0.1/grope
+
+DISTCLEANFILES =			\
+	stamp-gropetypebuiltins.h	\
+	gropetypebuiltins.h		\
+	gropetypebuiltins.c
 \ No newline at end of file
 
=== added file 'src/gropetypebuiltins.c.in'
--- src/gropetypebuiltins.c.in	1970-01-01 00:00:00 +0000
+++ src/gropetypebuiltins.c.in	2010-11-09 23:16:03 +0000
@@ -0,0 +1,31 @@
+/*** BEGIN file-header ***/
+#include "gropetypebuiltins.h"
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+#include "@filename@"
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type(void) {
+  static GType enum_type_id = 0;
+  if (G_UNLIKELY (!enum_type_id))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+    }
+  return enum_type_id;
+}
+/*** END value-tail ***/
+
 
=== added file 'src/gropetypebuiltins.h.in'
--- src/gropetypebuiltins.h.in	1970-01-01 00:00:00 +0000
+++ src/gropetypebuiltins.h.in	2010-11-09 23:16:03 +0000
@@ -0,0 +1,26 @@
+/*** BEGIN file-header ***/
+#ifndef __GROPE_ENUM_TYPES_H__
+#define __GROPE_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* !__GROPE_ENUM_TYPES_H__ */
+/*** END file-tail ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define GROPE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/
+