diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-04-12 15:50:06 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-04-12 15:50:06 +0800 |
| commit | 1c5f6313c58187ce7682058057b63e14ae6f70e5 (patch) | |
| tree | b32502d72fe77f9e42e47b89df5e9034b92b9546 /e-util/Makefile.am | |
| parent | 765a50d3df2d53b73b149fc2646f46722add7635 (diff) | |
| download | gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.gz gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.bz2 gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.lz gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.xz gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.zst gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.zip | |
Bug #681837 - Make enum type registration thread safe
Diffstat (limited to 'e-util/Makefile.am')
| -rw-r--r-- | e-util/Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 5e974f20bc..367add596b 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -6,11 +6,16 @@ ruledir = $(privdatadir) ENUM_TYPES = e-util-enums.h -e-util-enumtypes.h: e-util-enumtypes.h.template $(ENUM_TYPES) - $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template e-util-enumtypes.h.template $(ENUM_TYPES)) > $@ +e-util-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES) + $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \ + --fhead "#ifndef E_UTIL_ENUMTYPES_H\n#define E_UTIL_ENUMTYPES_H\n" \ + --ftail "#endif /* E_UTIL_ENUMTYPES_H */\n" \ + $(ENUM_TYPES)) > $@ -e-util-enumtypes.c: e-util-enumtypes.c.template $(ENUM_TYPES) - $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template e-util-enumtypes.c.template $(ENUM_TYPES)) > $@ +e-util-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES) + $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \ + --fhead "#include \"e-util-enumtypes.h\"" \ + $(ENUM_TYPES)) > $@ e-marshal.h: e-marshal.list $(AM_V_GEN) $(GLIB_GENMARSHAL) --header --prefix=e_marshal $^ > e-marshal.h.tmp && \ @@ -648,8 +653,6 @@ test_source_selector_SOURCES = test-source-selector.c test_source_selector_LDADD = $(TEST_LDADD) EXTRA_DIST = \ - e-util-enumtypes.h.template \ - e-util-enumtypes.c.template \ e-system.error.xml \ filter.error.xml \ widgets.error.xml \ |