gst/: get rid of gstmarshal.h dependency. It's not needed.

Original commit message from CVS:
2004-02-03  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* 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

diff --git a/ChangeLog b/ChangeLog
index fad156d..7119c90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2004-02-03  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
+       * 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  <in7y118@public.uni-hamburg.de>
+
        * gst/elements/gstfilesrc.c: (gst_filesrc_init),
        (gst_filesrc_dispose), (gst_filesrc_free_parent_mmap),
        (gst_filesrc_map_region), (gst_filesrc_get_mmap):

diff --git a/common b/common
index 508678c..ab32709 160000 (submodule)
--- 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 2c9ed9a..4541f62 100644 (file)
--- a/gst/elements/gstfakesink.c
+++ b/gst/elements/gstfakesink.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "gstfakesink.h"
+#include <gst/gstmarshal.h>
 
 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 f3a9100..9c11202 100644 (file)
--- a/gst/elements/gstfakesrc.c
+++ b/gst/elements/gstfakesrc.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "gstfakesrc.h"
+#include <gst/gstmarshal.h>
 
 #define DEFAULT_SIZEMIN                0
 #define DEFAULT_SIZEMAX                4096

diff --git a/gst/elements/gstidentity.c b/gst/elements/gstidentity.c
index 9994668..6fd3e75 100644 (file)
--- a/gst/elements/gstidentity.c
+++ b/gst/elements/gstidentity.c
@@ -29,6 +29,7 @@
 
 #include "../gst-i18n-lib.h"
 #include "gstidentity.h"
+#include <gst/gstmarshal.h>
 
 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 c36b088..33db65c 100644 (file)
--- a/gst/gst.h
+++ b/gst/gst.h
@@ -42,6 +42,7 @@
 #include <gst/gstindex.h>
 #include <gst/gstinfo.h>
 #include <gst/gstinterface.h>
+#include <gst/gstmarshal.h>
 #include <gst/gstobject.h>
 #include <gst/gstpad.h>
 #include <gst/gstpipeline.h>

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 7fd8811..c01778d 100644 (file)
--- 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 df23ec3..f73ca65 100644 (file)
--- 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 9a5951f..9b4119b 100644 (file)
--- 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 2fd1748..60fc2b4 100644 (file)
--- 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 5f62d8b..0cb918f 100644 (file)
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -27,7 +27,6 @@
 #include <gst/gstconfig.h>
 
 #include <glib-object.h>       /* note that this gets wrapped in __GST_OBJECT_H__ */
-#include <gst/gstmarshal.h>
 
 #include <gst/gsttypes.h>
 

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 18aef13..9afe749 100644 (file)
--- 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 97ced94..9f38b76 100644 (file)
--- 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 833008a..aaa3775 100644 (file)
--- 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 d170f55..c3158f9 100644 (file)
--- 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 54ba2c4..f985e65 100644 (file)
--- a/libs/gst/control/dparam.c
+++ b/libs/gst/control/dparam.c
@@ -29,6 +29,7 @@
 
 #include "dparam.h"
 #include "dparammanager.h"
+#include <gst/gstmarshal.h>
 
 GST_DEBUG_CATEGORY_EXTERN(_gst_control_debug);
 

diff --git a/libs/gst/control/dparammanager.c b/libs/gst/control/dparammanager.c
index 463e4cc..edebfe0 100644 (file)
--- a/libs/gst/control/dparammanager.c
+++ b/libs/gst/control/dparammanager.c
@@ -21,6 +21,7 @@
 
 #include "dparammanager.h"
 #include <gst/gstelement.h>
+#include <gst/gstmarshal.h>
 #include <gst/gstinfo.h>
 
 GST_DEBUG_CATEGORY_EXTERN(_gst_control_debug);

diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c
index 2c9ed9a..4541f62 100644 (file)
--- a/plugins/elements/gstfakesink.c
+++ b/plugins/elements/gstfakesink.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "gstfakesink.h"
+#include <gst/gstmarshal.h>
 
 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 f3a9100..9c11202 100644 (file)
--- a/plugins/elements/gstfakesrc.c
+++ b/plugins/elements/gstfakesrc.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "gstfakesrc.h"
+#include <gst/gstmarshal.h>
 
 #define DEFAULT_SIZEMIN                0
 #define DEFAULT_SIZEMAX                4096

diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c
index 9994668..6fd3e75 100644 (file)
--- a/plugins/elements/gstidentity.c
+++ b/plugins/elements/gstidentity.c
@@ -29,6 +29,7 @@
 
 #include "../gst-i18n-lib.h"
 #include "gstidentity.h"
+#include <gst/gstmarshal.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_identity_debug);
 #define GST_CAT_DEFAULT gst_identity_debug