diff --git a/ChangeLog b/ChangeLog index 784620557e..7307872c9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-23 Stefan Kost + + patch by: David Nečas + + * gst/Makefile.am: + Replace some non portable makefile constructs. + 2007-08-21 Stefan Kost * common/gtk-doc-plugins.mak: diff --git a/common b/common index 9c7f1a63df..cd25ca736b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 9c7f1a63dfed1b2770b5fdaa16e0ae114b2177cf +Subproject commit cd25ca736bc2446800de2180ad71fc1da858d324 diff --git a/gst/Makefile.am b/gst/Makefile.am index 0a12eb44e1..ff5c0126cf 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -230,7 +230,7 @@ gstenumtypes.h: $(gst_headers) --fprod "\n/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __GST_ENUM_TYPES_H__ */" \ - $^ > gstenumtypes.h + $(gst_headers) > gstenumtypes.h gstenumtypes.c: $(gst_headers) glib-mkenums \ @@ -239,7 +239,7 @@ gstenumtypes.c: $(gst_headers) --vhead "static void\nregister_@enum_name@ (GType* id)\n{\n static const G@Type@Value values[] = {" \ --vprod " { C_@TYPE@(@VALUENAME@), \"@VALUENAME@\", \"@valuenick@\" }," \ --vtail " { 0, NULL, NULL }\n };\n *id = g_@type@_register_static (\"@EnumName@\", values);\n}\nGType\n@enum_name@_get_type (void)\n{\n static GType id;\n static GOnce once = G_ONCE_INIT;\n\n g_once (&once, (GThreadFunc)register_@enum_name@, &id);\n return id;\n}\n" \ - $^ > gstenumtypes.c + $(gst_headers) > gstenumtypes.c %.c.gcov: .libs/libgstreamer_@GST_MAJORMINOR@_la-%.gcda %.c $(GCOV) -b -f -o $^ > $@.out