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
This commit is contained in:
parent
bf9deb812b
commit
b769a83fb4
@ -22,10 +22,10 @@ defs_DATA = gst-types.defs \
|
|||||||
pbutils.defs
|
pbutils.defs
|
||||||
defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
|
defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
|
||||||
|
|
||||||
noinst_HEADERS = pygst-private.h
|
noinst_HEADERS = common.h pygst-private.h
|
||||||
|
|
||||||
pygst_installdir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/
|
pygst_installdir = $(includedir)/gstreamer-@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 = \
|
versioned_overrides = \
|
||||||
gst-0.10.21.ignore \
|
gst-0.10.21.ignore \
|
||||||
|
@ -25,6 +25,7 @@ headers
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NO_IMPORT_PYGOBJECT
|
#define NO_IMPORT_PYGOBJECT
|
||||||
|
#include "common.h"
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
#include <pygobject.h>
|
|
||||||
#include "pygstminiobject.h"
|
#include "pygstminiobject.h"
|
||||||
|
|
||||||
#if (defined HAVE_OLD_PYGTK && (PY_VERSION_HEX < 0x02030000))
|
#if (defined HAVE_OLD_PYGTK && (PY_VERSION_HEX < 0x02030000))
|
||||||
|
@ -26,7 +26,7 @@ headers
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NO_IMPORT_PYGOBJECT
|
#define NO_IMPORT_PYGOBJECT
|
||||||
|
#include "common.h"
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
@ -25,6 +25,7 @@ headers
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NO_IMPORT_PYGOBJECT
|
#define NO_IMPORT_PYGOBJECT
|
||||||
|
#include "common.h"
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
|
|
||||||
#define _INSIDE_PYGST_
|
#define _INSIDE_PYGST_
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
extern PyTypeObject PyGstMiniObject_Type;
|
extern PyTypeObject PyGstMiniObject_Type;
|
||||||
|
|
||||||
|
@ -27,8 +27,6 @@
|
|||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
struct _PyGst_Functions {
|
struct _PyGst_Functions {
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#define NO_IMPORT_PYGOBJECT
|
#define NO_IMPORT_PYGOBJECT
|
||||||
#define _INSIDE_PYGST_
|
#define _INSIDE_PYGST_
|
||||||
|
#include "common.h"
|
||||||
#include "pygstminiobject.h"
|
#include "pygstminiobject.h"
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
@ -8,8 +8,6 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
/* Work around bugs in PyGILState api fixed in 2.4.0a4 */
|
/* Work around bugs in PyGILState api fixed in 2.4.0a4 */
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
* Author: Andy Wingo <wingo@pobox.com>
|
* Author: Andy Wingo <wingo@pobox.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common.h"
|
#include <Python.h>
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ headers
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NO_IMPORT_PYGOBJECT
|
#define NO_IMPORT_PYGOBJECT
|
||||||
|
#include "common.h"
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
@ -25,6 +25,7 @@ headers
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NO_IMPORT_PYGOBJECT
|
#define NO_IMPORT_PYGOBJECT
|
||||||
|
#include "common.h"
|
||||||
#include "pygst.h"
|
#include "pygst.h"
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user