diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2016-06-21 15:40:59 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2016-06-21 16:10:17 -0400 |
| commit | 482550e7e47cf48dd4bdab3adfe0d1777e20743a (patch) | |
| tree | 32773346a306a3d028c8c645dfb86abbc0c8886d /common-modified/gst-glib-gen.mak | |
| parent | fefa55ae7f2236264a7578dfd50e9945d5b0b1b9 (diff) | |
| download | farstream-482550e7e47cf48dd4bdab3adfe0d1777e20743a.tar.gz | |
Sync with latest common/
Diffstat (limited to 'common-modified/gst-glib-gen.mak')
| -rw-r--r-- | common-modified/gst-glib-gen.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak index 2d29b036..d14f5c64 100644 --- a/common-modified/gst-glib-gen.mak +++ b/common-modified/gst-glib-gen.mak @@ -10,16 +10,16 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") # these are all the rules generating the relevant files $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) - $(AM_V_GEN)glib-mkenums \ + $(AM_V_GEN)$(GLIB_MKENUMS) \ --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "\n/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define FS_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define FS_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \ $^ > $@ $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers) @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi - $(AM_V_GEN)glib-mkenums \ + $(AM_V_GEN)$(GLIB_MKENUMS) \ --fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \ |