[Xfce4-commits] <exo:xfce-4.6> Fix some small compiler warnings.

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to f5735309d8f8bf9fb35fe893de85733ee402fb29 (commit)
       from 373a699f18cf0c5b78e2cedbf9d4043aef4ad087 (commit)

commit f5735309d8f8bf9fb35fe893de85733ee402fb29
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Oct 8 12:31:51 2009 +0200

    Fix some small compiler warnings.

 exo-helper/Makefile.am |    2 +-
 exo/Makefile.am        |    3 ++-
 python/exomodule.c     |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/exo-helper/Makefile.am b/exo-helper/Makefile.am
index 50a47a2..17f2053 100644
--- a/exo-helper/Makefile.am
+++ b/exo-helper/Makefile.am
@@ -98,7 +98,7 @@ stamp-exo-helper-enum-types.h: $(exo_helper_headers) Makefile
 
 exo-helper-enum-types.c: $(exo_helper_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
-		--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include <exo-helper/exo-helper.h>\n" \
+		--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include <exo-helper/exo-helper.h>\n#include <exo-helper/exo-helper-enum-types.h>\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n at enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G at Type@Value values[] = {"\
 		--vprod "\t{ @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
diff --git a/exo/Makefile.am b/exo/Makefile.am
index a3cd484..c2880da 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -186,7 +186,8 @@ stamp-exo-marshal.h: exo-marshal.list Makefile
 	&& echo timestamp > $(@F)
 
 exo-marshal.c: exo-marshal.list Makefile
-	( cd $(srcdir) && glib-genmarshal \
+	echo "#include <exo/exo-marshal.h>" > xgen-emc \
+	&& ( cd $(srcdir) && glib-genmarshal \
 		--prefix=_exo_marshal \
 		--body exo-marshal.list ) >> xgen-emc \
 	&& cp xgen-emc exo-marshal.c \
diff --git a/python/exomodule.c b/python/exomodule.c
index ea282e2..82aac1d 100644
--- a/python/exomodule.c
+++ b/python/exomodule.c
@@ -32,6 +32,7 @@
 void exo_add_constants    (PyObject    *module,
                            const gchar *strip_prefix) G_GNUC_INTERNAL;
 void exo_register_classes (PyObject    *d) G_GNUC_INTERNAL;
+DL_EXPORT(void) init_exo (void);
 
 extern PyMethodDef exo_functions[];
 
@@ -108,7 +109,6 @@ pygtk_tree_path_to_pyobject (GtkTreePath *path)
 #endif
 
 
-
 DL_EXPORT(void)
 init_exo (void)
 {