summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e2b34e1)
raw | patch | inline | side by side (parent: e2b34e1)
author | Jan Schmidt <thaytan@mad.scientist.com> | |
Fri, 24 Aug 2007 16:39:06 +0000 (16:39 +0000) | ||
committer | Jan Schmidt <thaytan@mad.scientist.com> | |
Fri, 24 Aug 2007 16:39:06 +0000 (16:39 +0000) |
Original commit message from CVS:
* gst/Makefile.am:
Revert patch which uses $(gst_headers) instead of $^ because it
breaks make dist.
* gst/Makefile.am:
Revert patch which uses $(gst_headers) instead of $^ because it
breaks make dist.
ChangeLog | patch | blob | history | |
gst/Makefile.am | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 16e9a456557a57ef281586f2b6c6cc2d678d41fd..1713ccae44ddadad34c3e044e4ac60651470d6ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2007-08-24 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * gst/Makefile.am:
+ Revert patch which uses $(gst_headers) instead of $^ because it
+ breaks make dist.
+
2007-08-24 Jan Schmidt <thaytan@mad.scientist.com>
* tests/check/gst/gstbin.c: (GST_START_TEST):
diff --git a/gst/Makefile.am b/gst/Makefile.am
index ff5c0126cfefafc360f31e0efbec81923baa5d7f..0a12eb44e15ab0018091700a63905c2ed3d67c51 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
--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__ */" \
- $(gst_headers) > gstenumtypes.h
+ $^ > gstenumtypes.h
gstenumtypes.c: $(gst_headers)
glib-mkenums \
--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" \
- $(gst_headers) > gstenumtypes.c
+ $^ > gstenumtypes.c
%.c.gcov: .libs/libgstreamer_@GST_MAJORMINOR@_la-%.gcda %.c
$(GCOV) -b -f -o $^ > $@.out