Syntax checker complained about autoconf variable expansion used
inside Makefile.am.
This patch uses template files instead of options.
This also reduces quoting making template code more readable.
Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
---
server/Makefile.am | 34 +++++++------------------------
server/spice-server-enums.tmpl.c | 43 ++++++++++++++++++++++++++++++++++++++++
server/spice-server-enums.tmpl.h | 23 +++++++++++++++++++++
3 files changed, 73 insertions(+), 27 deletions(-)
create mode 100644 server/spice-server-enums.tmpl.c
create mode 100644 server/spice-server-enums.tmpl.h
diff --git a/server/Makefile.am b/server/Makefile.am
index 91f9666..5d1e9ee 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -201,33 +201,11 @@ endif
libspice_server_la_LIBADD = libserver.la
libspice_server_la_SOURCES =
-spice-server-enums.c: spice-server.h
- $(AM_V_GEN)glib-mkenums --fhead "#include \"config.h\"\n\n" \
- --fhead "#include <glib-object.h>\n" \
- --fhead "#include \"spice-server-enums.h\"\n\n" \
- --fprod "\n#include \"spice-server.h\"\n" \
- --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n};\n\n" \
- --vtail "GType\n@enum_name@_get_type (void)\n{\n" \
- --vtail " static GType type = 0;\n" \
- --vtail " static volatile gsize type_volatile = 0;\n\n" \
- --vtail " if (g_once_init_enter(&type_volatile)) {\n" \
- --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n" \
- --vtail " g_once_init_leave(&type_volatile, type);\n" \
- --vtail " }\n\n" \
- --vtail " return type;\n}\n\n" \
- $^ > $@
-
-spice-server-enums.h: spice-server.h
- $(AM_V_GEN)glib-mkenums --fhead "#ifndef SPICE_SERVER_ENUMS_H\n" \
- --fhead "#define SPICE_SERVER_ENUMS_H\n\n" \
- --fhead "G_BEGIN_DECLS\n\n" \
- --ftail "G_END_DECLS\n\n" \
- --ftail "#endif /* SPICE_SERVER_ENUMS_H */\n" \
- --eprod "#define SPICE_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
- --eprod "GType @enum_name@_get_type (void);\n" \
- $^ > $@
+spice-server-enums.c: spice-server.h spice-server-enums.tmpl.c
+ $(AM_V_GEN)glib-mkenums --template spice-server-enums.tmpl.c $^ > $@
+
+spice-server-enums.h: spice-server.h spice-server-enums.tmpl.h
+ $(AM_V_GEN)glib-mkenums --template spice-server-enums.tmpl.h $^ > $@
EXTRA_DIST = \
spice-bitmap-utils.tmpl.c \
@@ -235,6 +213,8 @@ EXTRA_DIST = \
glz-encode-match.tmpl.c \
glz-encode.tmpl.c \
spice-server.syms \
+ spice-server-enums.tmpl.h \
+ spice-server-enums.tmpl.c \
$(NULL)
BUILT_SOURCES = $(spice_built_sources)
diff --git a/server/spice-server-enums.tmpl.c b/server/spice-server-enums.tmpl.c
new file mode 100644
index 0000000..5e7fec3
--- /dev/null
+++ b/server/spice-server-enums.tmpl.c
@@ -0,0 +1,43 @@
+/*** BEGIN file-header ***/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib-object.h>
+
+#include "spice-server-enums.h"
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+#include "spice-server.h"
+
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+static const G@Type@Value _@enum_name@_values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+ { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+ { 0, NULL, NULL }
+};
+
+GType
+@enum_name@_get_type (void)
+{
+ static GType type = 0;
+ static volatile gsize type_volatile = 0;
+
+ if (g_once_init_enter(&type_volatile)) {
+ type = g_@type@_register_static ("@EnumName@", _@enum_name@_values);
+ g_once_init_leave(&type_volatile, type);
+ }
+
+ return type;
+}
+
+/*** END value-tail ***/
diff --git a/server/spice-server-enums.tmpl.h b/server/spice-server-enums.tmpl.h
new file mode 100644
index 0000000..57098d4
--- /dev/null
+++ b/server/spice-server-enums.tmpl.h
@@ -0,0 +1,23 @@
+/*** BEGIN file-header ***/
+#ifndef SPICE_SERVER_ENUMS_H
+#define SPICE_SERVER_ENUMS_H
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+#include "spice-server.h"
+/*** END file-production ***/
+
+/*** BEGIN enumeration-production ***/
+#define SPICE_TYPE_@ENUMSHORT@ @enum_name@_get_type()
+GType @enum_name@_get_type (void);
+/*** END enumeration-production ***/
+
+/*** BEGIN file-tail ***/
+
+G_END_DECLS
+
+#endif /* SPICE_SERVER_ENUMS_H */
+/*** END file-tail ***/
--
2.7.4
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel