[gst-cvs] gst-python: Use only one copy of pygstminiobject. Fixes #590348.

[<ale...@ke...>]

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

Author: Johannes Berg <joh...@si...>
Date:   Fri Aug 21 16:22:38 2009 +0200

Use only one copy of pygstminiobject. Fixes #590348.

Instead of linking pygstminiobject.c into all the modules,
we can link it only into _gst and export the symbols for
the other modules. This fixes bug #590348 because now the
class key/id is common for all modules as a side-effect.
Also makes the modules smaller.

---

 gst/Makefile.am |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index a0e1e2b..7358b7c 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -48,7 +48,7 @@ GEN_FILES = arg-types.py gst-types.defs libs.defs base.defs pbutils.defs
 # GStreamer bindings
 _gst_la_CFLAGS = $(common_cflags)
 _gst_la_LIBADD = $(common_libadd) $(GST_BASE_LIBS)
-_gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "^(init_gst|_PyGObject_API).*" \
+_gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "^(init_gst|_PyGObject_API|pygstminiobject_).*" \
 	$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_NET_LIBS) $(GST_DP_LIBS)
 _gst_la_SOURCES = 		\
 	gst-argtypes.c 		\
@@ -100,7 +100,7 @@ pbutils_la_CFLAGS = $(common_cflags) $(GST_PLUGINS_BASE_CFLAGS)
 pbutils_la_LIBADD = $(common_libadd) $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-0.10
 pbutils_la_LDFLAGS = $(common_ldflags) \
 	-export-symbols-regex "^(initpbutils|_PyGObject_API).*" $(GST_PLUGINS_BASE_LIBS)
-pbutils_la_SOURCES = pbutilsmodule.c gst-argtypes.c pygstminiobject.c
+pbutils_la_SOURCES = pbutilsmodule.c gst-argtypes.c
 nodist_pbutils_la_SOURCES = pbutils.c
 PBUTILS_OVERRIDES = pbutils.override
 PBUTILS_DEFS = pbutils.defs
@@ -124,7 +124,7 @@ if HAVE_GST_AUDIO
  audio_la_LIBADD = $(common_libadd) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-0.10
  audio_la_LDFLAGS = $(common_ldflags) \
 	-export-symbols-regex "^(initaudio|_PyGObject_API).*" $(GST_PLUGINS_BASE_LIBS)
- audio_la_SOURCES = audiomodule.c gst-argtypes.c pygstminiobject.c
+ audio_la_SOURCES = audiomodule.c gst-argtypes.c
  nodist_audio_la_SOURCES = audio.c
 audio.c: $(AUDIO_DEFS) $(AUDIO_OVERRIDES) $(GEN_FILES)
 
@@ -146,7 +146,7 @@ if HAVE_GST_VIDEO
  video_la_LIBADD = $(common_libadd) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10
  video_la_LDFLAGS = $(common_ldflags) \
 	-export-symbols-regex "^(initvideo|_PyGObject_API).*" $(GST_PLUGINS_BASE_LIBS)
- video_la_SOURCES = videomodule.c gst-argtypes.c pygstminiobject.c
+ video_la_SOURCES = videomodule.c gst-argtypes.c
  nodist_video_la_SOURCES = video.c
 video.c: $(VIDEO_DEFS) $(VIDEO_OVERRIDES) $(GEN_FILES)
 
@@ -168,7 +168,7 @@ if HAVE_GST_TAG
  tag_la_LIBADD = $(common_libadd) $(GST_PLUGINS_BASE_LIBS) -lgsttag-0.10
  tag_la_LDFLAGS = $(common_ldflags) \
 	-export-symbols-regex "^(inittag|_PyGObject_API).*" $(GST_PLUGINS_BASE_LIBS)
- tag_la_SOURCES = tagmodule.c gst-argtypes.c pygstminiobject.c
+ tag_la_SOURCES = tagmodule.c gst-argtypes.c
  nodist_tag_la_SOURCES = tag.c
 tag.c: $(TAG_DEFS) $(TAG_OVERRIDES) $(GEN_FILES)