gst-python: Don't install common.h and remove from public headers

[Tim Müller]

Module: gst-python
Branch: master
Commit: b769a83fb4bd15e83e7bcea82e9d2f940fae7bae
URL:    http://cgit.freedesktop.org/gstreamer/gst-python/commit/?id=b769a83fb4bd15e83e7bcea82e9d2f940fae7bae

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Tue Oct 11 23:33:21 2011 +0100

Don't install common.h and remove from public headers

Doesn't seem to be needed anyway. Also remove duplicate
pygobject.h include in common.h while at it.

https://bugzilla.gnome.org/show_bug.cgi?id=657435

---

 gst/Makefile.am         |    4 ++--
 gst/audio.override      |    1 +
 gst/common.h            |    1 -
 gst/interfaces.override |    2 +-
 gst/pbutils.override    |    1 +
 gst/pygst-private.h     |    1 +
 gst/pygst.h             |    2 --
 gst/pygstminiobject.c   |    1 +
 gst/pygstminiobject.h   |    2 --
 gst/pygstvalue.h        |    2 +-
 gst/tag.override        |    1 +
 gst/video.override      |    1 +
 12 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 0833ae7..4426a3a 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -22,10 +22,10 @@ defs_DATA = gst-types.defs \
 	pbutils.defs
 defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
 
-noinst_HEADERS = pygst-private.h
+noinst_HEADERS = common.h pygst-private.h
 
 pygst_installdir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/
-pygst_install_HEADERS = pygst.h common.h pygstvalue.h pygstminiobject.h pygstexception.h
+pygst_install_HEADERS = pygst.h pygstvalue.h pygstminiobject.h pygstexception.h
 
 versioned_overrides = \
 	gst-0.10.21.ignore 	\
diff --git a/gst/audio.override b/gst/audio.override
index 13addc0..f252346 100644
--- a/gst/audio.override
+++ b/gst/audio.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/common.h b/gst/common.h
index f522841..5d21854 100644
--- a/gst/common.h
+++ b/gst/common.h
@@ -28,7 +28,6 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 
-#include <pygobject.h>
 #include "pygstminiobject.h"
 
 #if (defined HAVE_OLD_PYGTK && (PY_VERSION_HEX < 0x02030000))
diff --git a/gst/interfaces.override b/gst/interfaces.override
index ed522de..ad06738 100644
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -26,7 +26,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
-
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/pbutils.override b/gst/pbutils.override
index 8321155..a3de280 100644
--- a/gst/pbutils.override
+++ b/gst/pbutils.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/pygst-private.h b/gst/pygst-private.h
index a032b90..cb7c6be 100644
--- a/gst/pygst-private.h
+++ b/gst/pygst-private.h
@@ -27,6 +27,7 @@
 
 #define _INSIDE_PYGST_
 #include "pygst.h"
+#include "common.h"
 
 extern PyTypeObject PyGstMiniObject_Type;
 
diff --git a/gst/pygst.h b/gst/pygst.h
index 83b6849..23b4b8a 100644
--- a/gst/pygst.h
+++ b/gst/pygst.h
@@ -27,8 +27,6 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 
-#include "common.h"
-
 G_BEGIN_DECLS
 
 struct _PyGst_Functions {
diff --git a/gst/pygstminiobject.c b/gst/pygstminiobject.c
index 94f28fe..443d245 100644
--- a/gst/pygstminiobject.c
+++ b/gst/pygstminiobject.c
@@ -22,6 +22,7 @@
 
 #define NO_IMPORT_PYGOBJECT
 #define _INSIDE_PYGST_
+#include "common.h"
 #include "pygstminiobject.h"
 #include "pygst.h"
 #include <gst/gst.h>
diff --git a/gst/pygstminiobject.h b/gst/pygstminiobject.h
index 3eb3d4a..08a5304 100644
--- a/gst/pygstminiobject.h
+++ b/gst/pygstminiobject.h
@@ -8,8 +8,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "common.h"
-
 G_BEGIN_DECLS
 
 /* Work around bugs in PyGILState api fixed in 2.4.0a4 */
diff --git a/gst/pygstvalue.h b/gst/pygstvalue.h
index 6083f59..a65f00b 100644
--- a/gst/pygstvalue.h
+++ b/gst/pygstvalue.h
@@ -19,7 +19,7 @@
  * Author: Andy Wingo <wingo at pobox.com>
  */
 
-#include "common.h"
+#include <Python.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/tag.override b/gst/tag.override
index 3daf564..813c44d 100644
--- a/gst/tag.override
+++ b/gst/tag.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/video.override b/gst/video.override
index ce4b201..ad2acd6 100644
--- a/gst/video.override
+++ b/gst/video.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>