colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: let enum and error templates be completely generic

Browse Source 
Don't include anything in the templates specific to the file to be built, like
#ifdef guards in headers or #include in sources.
This commit is contained in:
Aleksander Morgado
2011-12-19 17:24:33 +01:00
parent 4b8b99ee96
commit d22def9309
6 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build-aux/Makefile.am
View File

@@ -1,7 +1,7 @@
EXTRA_DIST = \
header-generator.xsl \
mm-enums-types.h.template \
mm-enums-types.c.template \
mm-enums-errors.h.template \
mm-enums-errors.c.template
mm-enums-template.h \
mm-enums-template.c \
mm-errors-template.h \
mm-errors-template.c

2
build-aux/mm-enums-types.c.template → build-aux/mm-enums-template.c
View File

@@ -1,6 +1,4 @@
/*** BEGIN file-header ***/
#include "ModemManager-enums.h"
#include "mm-enums-types.h"
/*** END file-header ***/

3
build-aux/mm-enums-types.h.template → build-aux/mm-enums-template.h
View File

@@ -1,6 +1,4 @@
/*** BEGIN file-header ***/
#ifndef __MM_ENUMS_TYPES_H__
#define __MM_ENUMS_TYPES_H__
#include <glib-object.h>
@@ -20,5 +18,4 @@ GType @enum_name@_get_type (void) G_GNUC_CONST;
/*** BEGIN file-tail ***/
G_END_DECLS
#endif /* __MM_ENUMS_TYPES_H__ */
/*** END file-tail ***/

3
build-aux/mm-errors-types.c.template → build-aux/mm-errors-template.c
View File

@@ -1,7 +1,4 @@
/*** BEGIN file-header ***/
#include "ModemManager-errors.h"
#include "mm-errors-types.h"
/*** END file-header ***/
/*** BEGIN file-production ***/

4
build-aux/mm-errors-types.h.template → build-aux/mm-errors-template.h
View File

@@ -1,8 +1,5 @@
/*** BEGIN file-header ***/
#ifndef __MM_ERRORS_TYPES_H__
#define __MM_ERRORS_TYPES_H__
#include <glib-object.h>
G_BEGIN_DECLS
@@ -23,5 +20,4 @@ GType @enum_name@_get_type (void) G_GNUC_CONST;
/*** BEGIN file-tail ***/
G_END_DECLS
#endif /* __MM_ERRORS_TYPES_H__ */
/*** END file-tail ***/

22
libmm-common/Makefile.am
View File

@@ -35,25 +35,31 @@ GENERATED_DOC = \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
# Enum types
mm-enums-types.h: $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-types.h.template
mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h
$(AM_V_GEN) glib-mkenums \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--fhead "#ifndef __MM_ENUMS_TYPES_H__\n#define __MM_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--ftail "#endif /* __MM_ENUMS_TYPES_H__ */\n" \
$(top_srcdir)/include/ModemManager-enums.h > $@
mm-enums-types.c: $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-types.c.template mm-enums-types.h
mm-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.c mm-enums-types.h
$(AM_V_GEN) glib-mkenums \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
--fhead "#include <ModemManager-enums.h>\n#include \"mm-enums-types.h\"\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
$(top_srcdir)/include/ModemManager-enums.h > $@
# Error types
mm-errors-types.h: $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-types.h.template
mm-errors-types.h: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.h
$(AM_V_GEN) glib-mkenums \
--template $(top_srcdir)/build-aux/mm-errors-types.h.template \
--fhead "#ifndef __MM_ERRORS_TYPES_H__\n#define __MM_ERRORS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-errors-template.h \
--ftail "#endif /* __MM_ERRORS_TYPES_H__ */\n" \
$(top_srcdir)/include/ModemManager-errors.h > $@
mm-errors-types.c: $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-types.c.template mm-errors-types.h
mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.c mm-errors-types.h
$(AM_V_GEN) glib-mkenums \
--template $(top_srcdir)/build-aux/mm-errors-types.c.template \
--fhead "#include <ModemManager-errors.h>\n#include \"mm-errors-types.h\"\n" \
--template $(top_srcdir)/build-aux/mm-errors-template.h \
$(top_srcdir)/include/ModemManager-errors.h > $@
# Manager interface