gnomemm r1429 - in gstreamermm/trunk: . build_shared gstreamer/gstreamermm

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Fri Mar 28 04:31:52 2008
New Revision: 1429
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1429&view=rev

Log:
2008-03-28  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/gstreamermm/init.cc: Modified init() to call
	GstBase::wrap_init() (which initializes list of wrapper functions for
	gstreamerbasemm)
	* Makefile.am: Changed order of subdirectories so that gstreamerbase
	is built before gstreamer directory (since gstreamermm depends on
	gstreamerbasemm -- Gst::init() calls GstBase::wrap_init())
	* build_shared/Makefile_build.am_fragment: Added gstreamerbase
	includes to "all_includes" so that Gst::init() knows about
	GstBase::wrap_init()
	* gstreamer/gstreamermm/Makefile.am: Added libgstreamerbasemm-0.10.la
	to list of libs to be linked to gstreamermm so that
	GstBase::wrap_init() is linked in and Gst::init() does not get an
	undefined reference error

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/Makefile.am
   gstreamermm/trunk/build_shared/Makefile_build.am_fragment
   gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/init.cc

Modified: gstreamermm/trunk/Makefile.am
==============================================================================
--- gstreamermm/trunk/Makefile.am	(original)
+++ gstreamermm/trunk/Makefile.am	Fri Mar 28 04:31:52 2008
@@ -1,5 +1,5 @@
 
-SUBDIRS=tools gstreamer gstreamerbase tests @EXAMPLE_SUBDIR@ @DEMO_SUBDIR@ @DOCS_SUBDIR@
+SUBDIRS=tools gstreamerbase gstreamer tests @EXAMPLE_SUBDIR@ @DEMO_SUBDIR@ @DOCS_SUBDIR@
 DIST_SUBDIRS=$(SUBDIRS) scripts
 
 EXTRA_DIST= build_shared/Makefile_build.am_fragment \

Modified: gstreamermm/trunk/build_shared/Makefile_build.am_fragment
==============================================================================
--- gstreamermm/trunk/build_shared/Makefile_build.am_fragment	(original)
+++ gstreamermm/trunk/build_shared/Makefile_build.am_fragment	Fri Mar 28 04:31:52 2008
@@ -25,6 +25,7 @@
 # for instance, so that gdkmm can use headers in pangomm.
 all_includes	= -I$(top_builddir)/$(sublib_topdir)\
 				  -I$(top_srcdir)/$(sublib_topdir)	\
+		  -I$(top_builddir)/gstreamerbase	-I$(top_srcdir)/gstreamerbase \
 				  $(sublib_cflags)
 
 dist_sources	= $(files_all_built_cc) $(files_all_extra_cc) $(files_all_built_h) $(files_all_extra_h)

Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	Fri Mar 28 04:31:52 2008
@@ -26,5 +26,6 @@
 lib_LTLIBRARIES = libgstreamermm-0.10.la
 libgstreamermm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
 libgstreamermm_0_10_la_LDFLAGS = $(common_ldflags)
-libgstreamermm_0_10_la_LIBADD  = $(GSTREAMERMM_LIBS)
+libgstreamermm_0_10_la_LIBADD  = $(top_builddir)/gstreamerbase/gstreamerbasemm/libgstreamerbasemm-0.10.la \
+				 $(GSTREAMERMM_LIBS)
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm/init.cc
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/init.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/init.cc	Fri Mar 28 04:31:52 2008
@@ -21,6 +21,7 @@
 #include <gstreamermm/wrap.h>
 #include <gstreamermm/wrap_init.h>
 #include <gstreamermm/gst_wrap_init.h>
+#include <gstreamerbasemm/wrap_init.h>
 #include <glibmm/init.h>
 #include <gst/gst.h>
 
@@ -42,6 +43,9 @@
     Gst::wrap_register_init();
     Gst::gst_wrap_init();
 
+    //Initialize wraping for gstreamerbasemm co-library
+    GstBase::wrap_init();
+
     s_init = true;
   }
 }