hippo-canvas r7291 - in trunk: . common/hippo

[walters svn gnome org]

Author: walters
Date: Sun Aug 31 17:07:24 2008
New Revision: 7291
URL: http://svn.gnome.org/viewvc/hippo-canvas?rev=7291&view=rev

Log:
Convert HippoPackFlags into a flags.  Fix up some introspection/build bits.


Modified:
   trunk/Makefile-introspection.am
   trunk/Makefile-python.am
   trunk/Makefile.am
   trunk/common/hippo/hippo-canvas-box.h
   trunk/common/hippo/hippo-canvas-type-builtins.c

Modified: trunk/Makefile-introspection.am
==============================================================================
--- trunk/Makefile-introspection.am	(original)
+++ trunk/Makefile-introspection.am	Sun Aug 31 17:07:24 2008
@@ -1,17 +1,21 @@
-HippoCanvas.gir: $(libhippocanvas_1_la_SOURCES) libhippocanvas-1.la Makefile
-	g-ir-scanner -v --namespace HippoCanvas \
+HippoCanvas.gir: $(libhippocanvas_1_la_SOURCES) $(nodist_libhippocanvas_1_la_SOURCES) libhippocanvas-1.la Makefile
+	libtool --mode=execute g-ir-scanner -v --namespace HippoCanvas \
+	    --strip-prefix=Hippo \
             --include=Gtk.gir \
             --library=hippocanvas-1 \
             --output $@ \
             --pkg gtk+-2.0 \
 	    $(libhippocanvas_1_la_CPPFLAGS) \
+	    $(nodist_libhippocanvas_1_la_SOURCES) \
             $(libhippocanvasinclude_HEADERS)
 
 girdir = $(datadir)/gir
 gir_DATA = HippoCanvas.gir
+CLEANFILES += $(gir_DATA)
 
 %.typelib: %.gir Makefile
 	$(DEBUG) g-ir-compiler $(G_IR_COMPILER_OPTS) $< -o $@
 
 typelibdir = $(datadir)/girepository
-typelib_DATA = HippoCanvas.typelib
+typelib_DATA = $(gir_DATA:.gir=.typelib)
+CLEANFILES += $(typelib_DATA)

Modified: trunk/Makefile-python.am
==============================================================================
--- trunk/Makefile-python.am	(original)
+++ trunk/Makefile-python.am	Sun Aug 31 17:07:24 2008
@@ -32,7 +32,7 @@
 	$(PYTHONSRCDIR)/hippo.override		\
 	$(PYTHONSRCDIR)/arg-types.py
 
-CLEANFILES = hippo.c
+CLEANFILES += hippo.c
 EXTRA_DIST += $(PYTHONDEFS_FILES)
 
 hippo.c: $(PYTHONDEFS_FILES)

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Aug 31 17:07:24 2008
@@ -30,6 +30,7 @@
 
 # These are added to using += in the included files
 lib_LTLIBRARIES =
+CLEANFILES=
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 BUILT_SOURCES =

Modified: trunk/common/hippo/hippo-canvas-box.h
==============================================================================
--- trunk/common/hippo/hippo-canvas-box.h	(original)
+++ trunk/common/hippo/hippo-canvas-box.h	Sun Aug 31 17:07:24 2008
@@ -9,7 +9,7 @@
 
 G_BEGIN_DECLS
 
-typedef enum
+typedef enum /*< flags >*/
 {
     HIPPO_PACK_EXPAND = 1,  /**< This is equivalent to both EXPAND and FILL for GtkBox,
                              * the way you'd get FILL=false is to set the alignment

Modified: trunk/common/hippo/hippo-canvas-type-builtins.c
==============================================================================
--- trunk/common/hippo/hippo-canvas-type-builtins.c	(original)
+++ trunk/common/hippo/hippo-canvas-type-builtins.c	Sun Aug 31 17:07:24 2008
@@ -6,7 +6,7 @@
 
 /* enumerations from "hippo/hippo-canvas-box.h" */
 #include "hippo/hippo-canvas-box.h"
-const GEnumValue _hippo_pack_flags_values[] = {
+const GFlagsValue _hippo_pack_flags_values[] = {
   { HIPPO_PACK_EXPAND, "HIPPO_PACK_EXPAND", "expand" },
   { HIPPO_PACK_END, "HIPPO_PACK_END", "end" },
   { HIPPO_PACK_FIXED, "HIPPO_PACK_FIXED", "fixed" },
@@ -25,7 +25,7 @@
   static GType type = 0;
 
   if (G_UNLIKELY (type == 0))
-    type = g_enum_register_static ("HippoPackFlags", _hippo_pack_flags_values);
+    type = g_flags_register_static ("HippoPackFlags", _hippo_pack_flags_values);
 
   return type;
 }