From 83c6b7229d49811c47fb03a576982907b580848b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Thu, 3 Jun 2010 17:24:23 -0400 Subject: Remove divergent copy of glib-gen.mk and use silent rules where possible --- common-modified/glib-gen.mak | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 common-modified/glib-gen.mak (limited to 'common-modified') diff --git a/common-modified/glib-gen.mak b/common-modified/glib-gen.mak deleted file mode 100644 index 66ae82b5..00000000 --- a/common-modified/glib-gen.mak +++ /dev/null @@ -1,44 +0,0 @@ -# these are the variables your Makefile.am should set -# the example is based on the colorbalance interface - -#glib_enum_headers=$(colorbalance_headers) -#glib_enum_define=GST_COLOR_BALANCE -#glib_enum_prefix=gst_color_balance - -enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") - -# these are all the rules generating the relevant files -%-marshal.h: %-marshal.list Makefile - glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $< > $*-marshal.h.tmp - mv $*-marshal.h.tmp $*-marshal.h - -%-marshal.c: %-marshal.list Makefile - echo "#include \"$*-marshal.h\"" >> $*-marshal.c.tmp - glib-genmarshal --body --prefix=$(glib_enum_prefix)_marshal $< >> $*-marshal.c.tmp - mv $*-marshal.c.tmp $*-marshal.c - -%-enum-types.h: $(glib_enum_headers) Makefile - glib-mkenums \ - --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define $(glib_enum_define)_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \ - $^ > $@ - -%-enum-types.c: $(glib_enum_headers) Makefile - @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi - glib-mkenums \ - --fhead "#include \"$*-enum-types.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[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" \ - $^ > $@ - -# a hack rule to make sure .Plo files exist because they get include'd -# from Makefile's -.deps/%-marshal.Plo: - touch $@ - -.deps/%-enum-types.Plo: - touch $@ -- cgit v1.2.1