GNOME.org
 

gnomemm r1808 - in gstreamermm/trunk: . build_shared docs/reference gstreamer gstreamer/gstreamermm gstreamer/gstreamermm/private gstreamer/src gstreamerbase/gstreamerbasemm gstreamerbase/gstreamerbasemm/private tests

Author: jaalburqu
Date: Mon Nov 24 03:54:55 2008
New Revision: 1808
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1808&view=rev

Log:
2008-11-23  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/gstreamermm/Makefile.am:
	* gstreamer/gstreamermm/private/Makefile.am:
	* gstreamerbase/gstreamerbasemm/Makefile.am:
	* gstreamerbase/gstreamerbasemm/private/Makefile.am: Removed generated
	plug-in sources from distribution because they should be generated on
	the build system.

	* docs/reference/Makefile.am: Modified so that the html/ directory is
	not distributed because docs may differ depending on the plug-ins
	available on the build system.  Made docs clean on `make clean' (for
	distcheck).

	* build_shared/Makefile_gensrc.am_fragment: Modified plug-in
	generation to use a stamp directory (like the regular .hg files do) so
	that the build system is aware of changes to them and knows how to
	regenerate them if necessary.  Modified the BUILT_SOURCES to build the
	stamp of the plug-ins which uses the plug-ins .hg and .ccg rules to
	generate the .hg and .ccg files and then creates a stamp after running
	gmmproc on the files.  Added the plug-in stamps to CLEANFILES so that
	they are cleaned with `make clean'.  Removed unused `sublib_srcdir'
	variable and unneeded (?) Makefile dependencies.  Used $(srcdir)
	and $(builddir) where necessary (for distcheck).  Added
	`stamp_plugin_dir' dependency to plug-in stamp generation because in
	the distcheck, a stamp directory is not created by `all-local'.  The
	distcheck now works to make it easier for future releases, but write
	permission is necessary in the source directory because the plug-in
	.hg and .ccg files must be generated there and gmmproc must also
	generate the private headers, the .cc and the .h files in the source
	directory structure so that wrap_init(), which includes stuff from the
	plug-in header files, is built successfully.

	* gstreamer/gstreamermm.h: Moved init includes to top (to keep logical
	order of includes).

Modified:
   gstreamermm/trunk/   (props changed)
   gstreamermm/trunk/AUTHORS
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
   gstreamermm/trunk/docs/reference/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/   (props changed)
   gstreamermm/trunk/gstreamer/gstreamermm.h
   gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am
   gstreamermm/trunk/gstreamer/src/ghostpad.ccg
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/   (props changed)
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/private/Makefile.am
   gstreamermm/trunk/tests/   (props changed)

Modified: gstreamermm/trunk/AUTHORS
==============================================================================
--- gstreamermm/trunk/AUTHORS	(original)
+++ gstreamermm/trunk/AUTHORS	Mon Nov 24 03:54:55 2008
@@ -1,10 +1,9 @@
 Please use the mailing list (gtkmm-list gnome org) instead of emailing
 developers directly.  See the ChangeLog for up-to-date information.
 
-Josà Alburquerque <jaalburquerque cox net>
+Josà Alburquerque <jaalburqu svn gnome org>
 Murray Cumming <murrayc murrayc com>
-Milosz Derezynski <internalerror gmail com>
-Siavash Safi <siavash safi gmail com>
 
 Some former contributors:
-
+Milosz Derezynski <internalerror gmail com>
+Siavash Safi <siavash safi gmail com>

Modified: gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
==============================================================================
--- gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment	(original)
+++ gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment	Mon Nov 24 03:54:55 2008
@@ -14,9 +14,11 @@
 tools_dir	= $(top_srcdir)/tools
 tools_dir_m4= $(top_srcdir)/tools/m4
 tools_dir_pm= $(top_srcdir)/tools/pm
+extra_defs_dir = $(top_builddir)/tools/extra_defs_gen
 
 gensrc_destdir = $(srcdir)/../$(sublib_name)
 stamp_dir = $(srcdir)/.stamps
+stamp_plugin_dir = $(builddir)/.stamps
 
 include $(tools_dir)/Makefile_list_of_sources.am_fragment
 tools_m4	= $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4)
@@ -25,9 +27,8 @@
 include $(srcdir)/../src/Makefile_list_of_hg.am_fragment
 files_all_ccg	= $(files_all_hg:%.hg=%.ccg)
 files_h		= $(files_all_hg:%.hg=$(gensrc_destdir)/%.h)
-files_cc	= $(files_all_hg:%.hg=$(gensrc_destdir)/%.cc)
 files_stamp	= $(files_all_hg:%.hg=$(stamp_dir)/stamp-%)
-files_stamp	+= $(files_plugin_hg:%.hg=$(stamp_dir)/stamp-%)
+files_plugin_stamp = $(files_plugin_hg:%.hg=$(stamp_plugin_dir)/stamp-%-plugin)
 
 #Installed gmmproc stuff, from glibmm:
 gmmproc_path = $(GMMPROC)
@@ -50,48 +51,66 @@
 run_gen_gst_wrap_init = $(PERL_PATH) $(gen_gst_wrap_init_path) $(gen_gst_wrap_init_args)
 
 # The generate_plugin_gmmproc_file utility
-generate_plugin_gmmproc_file_path = $(tools_dir)/extra_defs_gen/generate_plugin_gmmproc_file
+generate_plugin_gmmproc_file_path = $(extra_defs_dir)/generate_plugin_gmmproc_file
 generate_plugin_gmmproc_file_args = --namespace=$(sublib_namespace) --main-defs=$(main_defs) --target=$(sublib_parentdir)
 run_generate_plugin_gmmproc_file = $(generate_plugin_gmmproc_file_path) $(generate_plugin_gmmproc_file_args)
 
+files_plugin_hg_with_path = $(patsubst %.hg,$(srcdir)/%.hg,$(files_plugin_hg))
+
 
 EXTRA_DIST	= Makefile_list_of_hg.am_fragment \
 		  $(files_defs) $(files_all_hg) $(files_all_ccg)
 
-BUILT_SOURCES = $(files_plugin_hg)
-
-CLEANFILES = $(files_plugin_hg) $(files_plugin_hg:%.hg=%.ccg) $(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc
-
-
-$(files_plugin_hg): $(generate_plugin_gmmproc_file_path)
-	$(run_generate_plugin_gmmproc_file) --hg $(subst .hg,,$@) > $@
-	$(run_generate_plugin_gmmproc_file) --ccg $(subst .hg,,$@) > $(subst .hg,.ccg,$@)
+BUILT_SOURCES = $(foreach plugin,$(files_plugin_hg:.hg=),\
+		$(stamp_plugin_dir)/stamp-$(plugin)-plugin)
 
+CLEANFILES = $(files_plugin_hg) $(files_plugin_hg:%.hg=%.ccg) \
+	$(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc \
+	$(foreach plugin,$(files_plugin_hg:.hg=), \
+	$(stamp_plugin_dir)/stamp-$(plugin)-plugin)
+
+
+$(files_plugin_hg_with_path): $(generate_plugin_gmmproc_file_path) \
+	$(tools_m4) $(files_defs)
+	$(run_generate_plugin_gmmproc_file) --hg \
+		$(notdir $(subst .hg,,$@)) >  $@
+
+$(files_plugin_hg_with_path:.hg=.ccg): $(subst .ccg,.hg,$@) \
+	$(generate_plugin_gmmproc_file_path) $(tools_m4) $(files_defs)
+	$(run_generate_plugin_gmmproc_file) --ccg \
+		$(notdir $(subst .ccg,,$@)) >  $@
 
 $(stamp_dir)/stamp-%: %.hg %.ccg $(tools_m4) $(files_defs)
 	$(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir)
 	@echo 'timestamp' > $@
 
-sublib_srcdir		= $(srcdir)/../src
-files_hg_with_path	= $(patsubst %.hg,$(sublib_srcdir)/%.hg,$(files_all_hg))
-files_plugin_hg_with_path = $(patsubst %.hg,$(sublib_srcdir)/%.hg,$(files_plugin_hg))
+$(stamp_plugin_dir)/stamp-%-plugin: $(stamp_plugin_dir) $(srcdir)/%.hg \
+	$(srcdir)/%.ccg $(tools_m4) $(files_defs)
+	$(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir)
+	@echo 'timestamp' > $@
+
+$(stamp_plugin_dir):
+	@(test -d $(stamp_plugin_dir) || mkdir $(stamp_plugin_dir))
+
+files_hg_with_path	= $(patsubst %.hg,$(srcdir)/%.hg,$(files_all_hg))
 
 $(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_path) $(files_hg_with_path) \
-	$(files_plugin_hg_with_path) Makefile
+	$(files_plugin_hg_with_path)
 	$(run_gen_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) \
 	  $(filter %.hg,$(foreach plugin,$(subst .hg,,$(files_plugin_hg)), \
-	  ./$(shell $(run_generate_plugin_gmmproc_file) \
+	  $(srcdir)/$(shell $(run_generate_plugin_gmmproc_file) \
 	  --suggest-hg $(plugin)))) >$@
 
-$(gensrc_destdir)/gst_wrap_init.cc: $(gen_gst_wrap_init_in) $(files_hg_with_path) Makefile
+$(gensrc_destdir)/gst_wrap_init.cc: $(gen_gst_wrap_init_in) $(files_hg_with_path)
 	$(run_gen_gst_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) >$@
 
-create-stamp-dir:
+create-stamp-dir: $(stamp_plugin_dir)
 	@(test -d $(stamp_dir) || mkdir $(stamp_dir))
 
 if MAINTAINER_MODE
-all-local: create-stamp-dir $(files_stamp) $(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc
+all-local: create-stamp-dir $(files_stamp) $(files_plugin_stamp) \
+	$(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc
 endif
 
 maintainer-clean-local:
-	rm -rf $(stamp_dir)
+	rm -rf $(stamp_dir) $(stamp_plugin_dir)

Modified: gstreamermm/trunk/docs/reference/Makefile.am
==============================================================================
--- gstreamermm/trunk/docs/reference/Makefile.am	(original)
+++ gstreamermm/trunk/docs/reference/Makefile.am	Mon Nov 24 03:54:55 2008
@@ -6,7 +6,7 @@
 docdir = $(datadir)/doc/gstreamermm-0.10/docs
 referencedir=$(docdir)/reference/html
 
-EXTRA_DIST=$(doxygen_configfile) html reference-index.txt
+EXTRA_DIST=$(doxygen_configfile) reference-index.txt
 
 HTML_INDEX=html/index.html
 
@@ -44,5 +44,7 @@
 
 maintainer-clean-local: doc-clean
 
+clean-local: doc-clean
+
 .PHONY: doc-clean install-reference uninstall-reference
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h	Mon Nov 24 03:54:55 2008
@@ -1,6 +1,10 @@
 #ifndef _GSTREAMERMM_H_
 #define _GSTREAMERMM_H_
 
+#include <gstreamermm/init.h>
+#include <gstreamermm/version.h>
+#include <gstreamermm/wrap_init.h>
+
 // Core includes
 #include <gstreamermm/bin.h>
 #include <gstreamermm/buffer.h>
@@ -45,9 +49,4 @@
 #include <gstreamermm/basetransform.h>
 #include <gstreamermm/pushsrc.h>
 
-#include <gstreamermm/init.h>
-#include <gstreamermm/version.h>
-#include <gstreamermm/wrap_init.h>
-
 #endif // _GSTREAMERMM_H
-

Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	Mon Nov 24 03:54:55 2008
@@ -24,7 +24,7 @@
 include $(top_srcdir)/build_shared/Makefile_build.am_fragment
 
 lib_LTLIBRARIES = libgstreamermm-0.10.la
-libgstreamermm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc) $(files_plugin_built_cc)
+libgstreamermm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
+nodist_libgstreamermm_0_10_la_SOURCES = $(files_plugin_built_cc)
 libgstreamermm_0_10_la_LDFLAGS = $(common_ldflags)
 libgstreamermm_0_10_la_LIBADD  = $(GSTREAMERMM_LIBS)
-

Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am	Mon Nov 24 03:54:55 2008
@@ -9,14 +9,14 @@
 files_extra_p_h		= object_p.h miniobject_p.h taglist_p.h
 files_extra_all_p_h	= object_p.h miniobject_p.h taglist_p.h
 
-dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h) \
-	       $(files_built_plugin_p_h)
+dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h)
 DISTFILES = $(DIST_COMMON) $(dist_sources)
 
 CLEANFILES = $(files_built_plugin_p_h)
 
 private_includedir	= $(includedir)/gstreamermm-0.10/gstreamermm/private
 private_include_HEADERS	= $(files_built_p_h) $(files_extra_p_h)
+nodist_private_include_HEADERS	= $(files_built_plugin_p_h)
 
 maintainer-clean-local:
 	(cd $(srcdir) && rm -f $(files_built_p_h) $(files_built_plugin_p_h))

Modified: gstreamermm/trunk/gstreamer/src/ghostpad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/ghostpad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/ghostpad.ccg	Mon Nov 24 03:54:55 2008
@@ -31,7 +31,7 @@
   : _CONSTRUCT("name", name.c_str(),
       "direction", (GstPadDirection) target->get_direction())
 {
-  if (!gst_ghost_pad_construct(gobj(), name.c_str(), target->gobj()))
+  if (!gst_ghost_pad_construct(gobj()))
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&,"
       " const Glib::RefPtr<Pad>&): Unsuccessful construction of ghost pad.");
 }
@@ -39,7 +39,7 @@
 GhostPad::GhostPad(const Glib::ustring& name, PadDirection direction)
   : _CONSTRUCT("name", name.c_str(), "direction", (GstPadDirection) direction)
 {
-  if (!gst_ghost_pad_construct_no_target(gobj(), name.c_str(), (GstPadDirection) direction))
+  if (!gst_ghost_pad_construct(gobj()))
   {
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&, PadDirection):"
     " Unsuccessful construction of ghost pad.");
@@ -51,7 +51,7 @@
     : _CONSTRUCT("name", name.c_str(), "direction",
         (GstPadDirection) target->get_direction(), "template", templ->gobj())
 {
-  if (!gst_ghost_pad_construct_from_template(gobj(), name.c_str(), target->gobj(), templ->gobj()))
+  if (!gst_ghost_pad_construct(gobj()))
   {
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&,"
       " const Glib::RefPtr<Pad>&, const Glib::RefPtr<PadTemplate>&):"
@@ -63,7 +63,7 @@
     : _CONSTRUCT("name", name.c_str(), "direction", 
         (GstPadDirection) templ->get_direction(), "template", templ->gobj())
 {
-  if (!gst_ghost_pad_construct_no_target_from_template(gobj(), name.c_str(), templ->gobj()))
+  if (!gst_ghost_pad_construct(gobj()))
   {
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&,"
       " const Glib::RefPtr<PadTemplate>&): Unsuccessful construction of ghost"

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am	Mon Nov 24 03:54:55 2008
@@ -24,6 +24,7 @@
 include $(top_srcdir)/build_shared/Makefile_build.am_fragment
 
 lib_LTLIBRARIES = libgstreamerbasemm-0.10.la
-libgstreamerbasemm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc) $(files_plugin_built_cc)
+libgstreamerbasemm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
+nodist_libgstreamerbasemm_0_10_la_SOURCES = $(files_plugin_built_cc)
 libgstreamerbasemm_0_10_la_LDFLAGS = $(common_ldflags)
 libgstreamerbasemm_0_10_la_LIBADD  = $(GSTREAMERBASEMM_LIBS) $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm/private/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm/private/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm/private/Makefile.am	Mon Nov 24 03:54:55 2008
@@ -9,14 +9,15 @@
 files_extra_p_h		= 
 files_extra_all_p_h	= 
 
-dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h) \
-	       $(files_built_plugin_p_h)
+dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h)
+
 DISTFILES = $(DIST_COMMON) $(dist_sources)
 
 CLEANFILES = $(files_built_plugin_p_h)
 
 private_includedir	= $(includedir)/gstreamerbasemm-0.10/gstreamerbasemm/private
 private_include_HEADERS	= $(files_built_p_h) $(files_extra_p_h)
+nodist_private_include_HEADERS	= $(files_built_plugin_p_h)
 
 maintainer-clean-local:
 	(cd $(srcdir) && rm -f $(files_built_p_h) $(files_built_plugin_p_h))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]