diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2011-12-19 17:24:33 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:34 +0100 |
| commit | d22def9309d4051ebd82b76f6704f65ad39d98b5 (patch) | |
| tree | a3fdf326655bfd3e48c4a438cb5a1394fbdf6165 /libmm-common | |
| parent | 4b8b99ee96f16e3f2d623cb896a4d1bf7f12820f (diff) | |
build: let enum and error templates be completely generic
Don't include anything in the templates specific to the file to be built, like
#ifdef guards in headers or #include in sources.
Diffstat (limited to 'libmm-common')
| -rw-r--r-- | libmm-common/Makefile.am | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am index 56e059a5..83259a9c 100644 --- a/libmm-common/Makefile.am +++ b/libmm-common/Makefile.am @@ -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 |