From b8d5e34c0e3a0d87e9a4bbc82fedbb99e37b056d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 18 Dec 2007 15:17:30 +0000 Subject: glib-gen.mak: Use #include "header" instead of #include
for the generated enum C files as the file will alwa... Original commit message from CVS: * glib-gen.mak: Use #include "header" instead of #include
for the generated enum C files as the file will always be in the same directory and some compilers seem to be a bit strict about that unless . is added to the include path. Include all headers that were used to generate the source files in the C file as they're used there. --- glib-gen.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'glib-gen.mak') diff --git a/glib-gen.mak b/glib-gen.mak index eff4147..dcb08b4 100644 --- a/glib-gen.mak +++ b/glib-gen.mak @@ -5,6 +5,8 @@ #glib_enum_define=GST_COLOR_BALANCE #glib_enum_prefix=gst_color_balance +enum_headers=$(foreach h,$(glib_enum_headers),\#include <$(h)>\n) + # these are all the rules generating the relevant files %-marshal.h: %-marshal.list glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $^ > $*-marshal.h.tmp @@ -26,7 +28,7 @@ %-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 glib-mkenums \ - --fhead "#include <$*.h>" \ + --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ -- cgit v1.2.1