From 4749c7a4f1e009179d1316214bb379200d69f8a1 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 3 Feb 2004 03:31:26 +0000 Subject: [PATCH] gst/: get rid of gstmarshal.h dependency. It's not needed. Original commit message from CVS: 2004-02-03 Benjamin Otte * gst/parse/Makefile.am: * gst/gstobject.h: get rid of gstmarshal.h dependency. It's not needed. * gst/gst.h: * gst/elements/gstfakesink.c: * gst/elements/gstfakesrc.c: * gst/elements/gstidentity.c: * gst/gstbin.c: * gst/gstelement.c: * gst/gstindex.c: * gst/gstobject.c: * gst/gstpad.c: * gst/gstthread.c: * gst/gstxml.c: * libs/gst/control/dparam.c: * libs/gst/control/dparammanager.c: include gstmarshal.h. Fixes #132045 --- ChangeLog | 21 +++++++++++++++++++++ common | 2 +- gst/elements/gstfakesink.c | 1 + gst/elements/gstfakesrc.c | 1 + gst/elements/gstidentity.c | 1 + gst/gst.h | 1 + gst/gstbin.c | 1 + gst/gstelement.c | 1 + gst/gstindex.c | 1 + gst/gstobject.c | 1 + gst/gstobject.h | 1 - gst/gstpad.c | 1 + gst/gstthread.c | 1 + gst/gstxml.c | 1 + gst/parse/Makefile.am | 7 +------ libs/gst/control/dparam.c | 1 + libs/gst/control/dparammanager.c | 1 + plugins/elements/gstfakesink.c | 1 + plugins/elements/gstfakesrc.c | 1 + plugins/elements/gstidentity.c | 1 + 20 files changed, 39 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fad156d2dc..7119c903b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2004-02-03 Benjamin Otte + + * gst/parse/Makefile.am: + * gst/gstobject.h: + get rid of gstmarshal.h dependency. It's not needed. + * gst/gst.h: + * gst/elements/gstfakesink.c: + * gst/elements/gstfakesrc.c: + * gst/elements/gstidentity.c: + * gst/gstbin.c: + * gst/gstelement.c: + * gst/gstindex.c: + * gst/gstobject.c: + * gst/gstpad.c: + * gst/gstthread.c: + * gst/gstxml.c: + * libs/gst/control/dparam.c: + * libs/gst/control/dparammanager.c: + include gstmarshal.h. + Fixes #132045 + 2004-02-03 Benjamin Otte * gst/elements/gstfilesrc.c: (gst_filesrc_init), diff --git a/common b/common index 508678c12e..ab32709acc 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 508678c12ea745e207eb8bb3be12c156e3bb698c +Subproject commit ab32709acc23a4a1b458823fd094327332408035 diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c index 2c9ed9a25f..4541f62740 100644 --- a/gst/elements/gstfakesink.c +++ b/gst/elements/gstfakesink.c @@ -26,6 +26,7 @@ #endif #include "gstfakesink.h" +#include GST_DEBUG_CATEGORY_STATIC (gst_fakesink_debug); #define GST_CAT_DEFAULT gst_fakesink_debug diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c index f3a9100679..9c112023fa 100644 --- a/gst/elements/gstfakesrc.c +++ b/gst/elements/gstfakesrc.c @@ -29,6 +29,7 @@ #endif #include "gstfakesrc.h" +#include #define DEFAULT_SIZEMIN 0 #define DEFAULT_SIZEMAX 4096 diff --git a/gst/elements/gstidentity.c b/gst/elements/gstidentity.c index 9994668a11..6fd3e755a3 100644 --- a/gst/elements/gstidentity.c +++ b/gst/elements/gstidentity.c @@ -29,6 +29,7 @@ #include "../gst-i18n-lib.h" #include "gstidentity.h" +#include GST_DEBUG_CATEGORY_STATIC (gst_identity_debug); #define GST_CAT_DEFAULT gst_identity_debug diff --git a/gst/gst.h b/gst/gst.h index c36b088d83..33db65cf9f 100644 --- a/gst/gst.h +++ b/gst/gst.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include diff --git a/gst/gstbin.c b/gst/gstbin.c index 7fd881184a..c01778d544 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -25,6 +25,7 @@ #include "gstevent.h" #include "gstbin.h" +#include "gstmarshal.h" #include "gstxml.h" #include "gstinfo.h" diff --git a/gst/gstelement.c b/gst/gstelement.c index df23ec36de..f73ca65e77 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -27,6 +27,7 @@ #include "gstelement.h" #include "gstbin.h" +#include "gstmarshal.h" #include "gsterror.h" #include "gstscheduler.h" #include "gstevent.h" diff --git a/gst/gstindex.c b/gst/gstindex.c index 9a5951f505..9b4119b779 100644 --- a/gst/gstindex.c +++ b/gst/gstindex.c @@ -26,6 +26,7 @@ #include "gstregistrypool.h" #include "gstpad.h" #include "gstindex.h" +#include "gstmarshal.h" /* Index signals and args */ enum { diff --git a/gst/gstobject.c b/gst/gstobject.c index 2fd1748008..60fc2b47c8 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -23,6 +23,7 @@ #include "gst_private.h" #include "gstobject.h" +#include "gstmarshal.h" #include "gstinfo.h" #ifndef GST_DISABLE_TRACE diff --git a/gst/gstobject.h b/gst/gstobject.h index 5f62d8bb47..0cb918ff7b 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -27,7 +27,6 @@ #include #include /* note that this gets wrapped in __GST_OBJECT_H__ */ -#include #include diff --git a/gst/gstpad.c b/gst/gstpad.c index 18aef133c7..9afe749647 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -23,6 +23,7 @@ #include "gst_private.h" #include "gstpad.h" +#include "gstmarshal.h" #include "gstutils.h" #include "gstelement.h" #include "gstbin.h" diff --git a/gst/gstthread.c b/gst/gstthread.c index 97ced94baa..9f38b76e35 100644 --- a/gst/gstthread.c +++ b/gst/gstthread.c @@ -24,6 +24,7 @@ #include "gst_private.h" #include "gstthread.h" +#include "gstmarshal.h" #include "gstscheduler.h" #include "gstinfo.h" #include "gstlog.h" diff --git a/gst/gstxml.c b/gst/gstxml.c index 833008ae86..aaa3775102 100644 --- a/gst/gstxml.c +++ b/gst/gstxml.c @@ -23,6 +23,7 @@ #include "gst_private.h" #include "gstxml.h" +#include "gstmarshal.h" #include "gstinfo.h" #include "gstbin.h" diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am index d170f55824..c3158f9025 100644 --- a/gst/parse/Makefile.am +++ b/gst/parse/Makefile.am @@ -18,15 +18,10 @@ libgstparse_la_LIBADD = $(LIBGST_LIBS) noinst_HEADERS = grammar.tab.h -grammar.tab.c grammar.tab.h: grammar.y ../gstmarshal.h +grammar.tab.c grammar.tab.h: grammar.y $(BISON_PATH) -d -v -p_gst_parse__yy $(srcdir)/grammar.y -o grammar.tab.c parse.l : grammar.tab.h lex._gst_parse_yy.c: parse.l $(FLEX_PATH) -P_gst_parse_yy $^ - -## this is so make install without a previous make can work, because -## this dir needs gstmarshal.h generated -../gstmarshal.h: - cd .. && $(MAKE) gstmarshal.h diff --git a/libs/gst/control/dparam.c b/libs/gst/control/dparam.c index 54ba2c406e..f985e65b9a 100644 --- a/libs/gst/control/dparam.c +++ b/libs/gst/control/dparam.c @@ -29,6 +29,7 @@ #include "dparam.h" #include "dparammanager.h" +#include GST_DEBUG_CATEGORY_EXTERN(_gst_control_debug); diff --git a/libs/gst/control/dparammanager.c b/libs/gst/control/dparammanager.c index 463e4cc07e..edebfe0752 100644 --- a/libs/gst/control/dparammanager.c +++ b/libs/gst/control/dparammanager.c @@ -21,6 +21,7 @@ #include "dparammanager.h" #include +#include #include GST_DEBUG_CATEGORY_EXTERN(_gst_control_debug); diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 2c9ed9a25f..4541f62740 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -26,6 +26,7 @@ #endif #include "gstfakesink.h" +#include GST_DEBUG_CATEGORY_STATIC (gst_fakesink_debug); #define GST_CAT_DEFAULT gst_fakesink_debug diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index f3a9100679..9c112023fa 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -29,6 +29,7 @@ #endif #include "gstfakesrc.h" +#include #define DEFAULT_SIZEMIN 0 #define DEFAULT_SIZEMAX 4096 diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index 9994668a11..6fd3e755a3 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -29,6 +29,7 @@ #include "../gst-i18n-lib.h" #include "gstidentity.h" +#include GST_DEBUG_CATEGORY_STATIC (gst_identity_debug); #define GST_CAT_DEFAULT gst_identity_debug