diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-18 15:17:30 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-18 15:17:30 +0000 |
| commit | b8d5e34c0e3a0d87e9a4bbc82fedbb99e37b056d (patch) | |
| tree | c119ce63aa5308093e9bd1acc85fb7fbe4bdfbe2 | |
| parent | 67b8f4e3c576945f4d778c9040876af3a5a0756e (diff) | |
| download | gstreamer-common-b8d5e34c0e3a0d87e9a4bbc82fedbb99e37b056d.tar.gz | |
glib-gen.mak: Use #include "header" instead of #include <header> 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 <header> 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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | glib-gen.mak | 4 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,14 @@ +2007-12-18 Sebastian Dröge <slomo@circular-chaos.org> + + * glib-gen.mak: + Use #include "header" instead of #include <header> 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. + 2007-12-17 Tim-Philipp Müller <tim at centricular dot net> * win32.mak: (win32), (win32defs), (win32crlf): 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@\" }," \ |