[libgda/LIBGDA_4.2] Correction for bug #654068

[Vivien Malerba <vivien src gnome org>]

commit 8fc32084e8d92f839aeb039fdf74401d2a0091d9
Author: Vivien Malerba <malerba gnome-db org>
Date:   Fri Jul 15 22:06:41 2011 +0200

    Correction for bug #654068
    
    the @filename argument of glib-mkenums is source of failure
    when compiling natively on Windows platform

 libgda-ui/Makefile.am         |    2 --
 libgda/Makefile.am            |    2 --
 libgda/sql-parser/Makefile.am |    2 --
 3 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 2af194a..db84623 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -80,7 +80,6 @@ gdaui-enum-types.h: s-enum-types-h
 s-enum-types-h: @REBUILD@ $(ui_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 	                --fhead "#ifndef __LIBGDAUI_ENUM_TYPES_H__\n#define __LIBGDAUI_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define GDAUI_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
 			--ftail "G_END_DECLS\n\n#endif /* __LIBGDAUI_ENUM_TYPES_H__ */" \
 		$(ui_headers) ) > tmp-gdaui-enum-types.h \
@@ -95,7 +94,6 @@ s-enum-types-c: @REBUILD@ $(ui_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 	                --fhead "#include <libgda-ui/libgda-ui.h>\n" \
 	                --fhead "#include <glib-object.h>" \
-                        --fprod "\n/* enumerations from \"@filename \" */" \
 			--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {" 	\
 			--vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 2b7e204..406ae0b 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -194,7 +194,6 @@ gda-enum-types.h: s-enum-types-h
 s-enum-types-h: @REBUILD@ $(gda_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 	                --fhead "#ifndef __LIBGDA_ENUM_TYPES_H__\n#define __LIBGDA_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define GDA_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
 			--ftail "G_END_DECLS\n\n#endif /* __LIBGDA_ENUM_TYPES_H__ */" \
 		$(gda_headers)) > tmp-gda-enum-types.h \
@@ -209,7 +208,6 @@ s-enum-types-c: @REBUILD@ $(gda_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 	                --fhead "#include <libgda/libgda.h>\n" \
 	                --fhead "#include <glib-object.h>" \
-                        --fprod "\n/* enumerations from \"@filename \" */" \
 			--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {" 	\
 			--vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \
diff --git a/libgda/sql-parser/Makefile.am b/libgda/sql-parser/Makefile.am
index af398fb..8871e93 100644
--- a/libgda/sql-parser/Makefile.am
+++ b/libgda/sql-parser/Makefile.am
@@ -44,7 +44,6 @@ gda-sql-parser-enum-types.h: s-enum-types-h
 s-enum-types-h: @REBUILD@ $(libgda_sql_parser_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 	                --fhead "#ifndef __LIBGDA_SQL_PARSER_ENUM_TYPES_H__\n#define __LIBGDA_SQL_PARSER_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define GDA_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
 			--ftail "G_END_DECLS\n\n#endif /* __LIBGDA_ENUM_TYPES_H__ */" \
 		$(libgda_sql_parser_headers)) > tmp-gda-enum-types.h \
@@ -61,7 +60,6 @@ s-enum-types-c: @REBUILD@ $(libgda_sql_parser_headers) Makefile
 	                --fhead "#include <sql-parser/gda-sql-parser.h>\n" \
 	                --fhead "#include <sql-parser/gda-sql-statement.h>\n" \
 	                --fhead "#include <glib-object.h>" \
-                        --fprod "\n/* enumerations from \"@filename \" */" \
 			--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {" 	\
 			--vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \