gnomemm r1863 - in gstreamermm/trunk: . build_shared gstreamer/gstreamermm gstreamerbase/gstreamerbasemm tools/m4

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Tue Dec 16 05:50:16 2008
New Revision: 1863
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1863&view=rev

Log:
2008-12-16  Josà Alburquerque  <jaalburqu svn gnome org>

	* build_shared/Makefile_build_gensrc.am_fragment:
	* gstreamer/gstreamermm/Makefile.am:
	* gstreamerbase/gstreamerbasemm/Makefile.am: Removed wrap_init.cc from
	distribution because it depends on plug-in generation and should be
	generated in build system.

	* build_shared/Makefile_gensrc.am_fragment: Used variable
	$(files_plugin_stamp) instead of complex $(foreach ...) expression in
	CLEANFILES and in BUILT_SOURCES.  Modified plugin .hg generation to
	pipe the output of generate_plugin_gmmproc_file to m4 instead of using
	$(eval ...) to define variables for temporary files.  Modified build
	process to generate plug-in .hg and .ccg files and then run through
	gmmproc.  Added wrap_init.cc to BUILT_SOURCES because it is now not
	distributed.

	* tools/m4/Makefile.am: Added ctocpp*.m4 to distribution.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/build_shared/Makefile_build_gensrc.am_fragment
   gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
   gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am
   gstreamermm/trunk/tools/m4/Makefile.am

Modified: gstreamermm/trunk/build_shared/Makefile_build_gensrc.am_fragment
==============================================================================
--- gstreamermm/trunk/build_shared/Makefile_build_gensrc.am_fragment	(original)
+++ gstreamermm/trunk/build_shared/Makefile_build_gensrc.am_fragment	Tue Dec 16 05:50:16 2008
@@ -47,12 +47,12 @@
 files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg)
 endif
 
-files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc
+files_built_cc = $(files_hg:.hg=.cc)
 files_built_h = $(files_hg:.hg=.h)
 
 files_patched_h = $(files_patched_hg:.hg=.h)
 
-files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc
+files_all_built_cc = $(files_all_hg:.hg=.cc)
 files_all_built_h = $(files_all_hg:.hg=.h)
 
 files_plugin_built_cc = $(files_plugin_hg:.hg=.cc)

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	Tue Dec 16 05:50:16 2008
@@ -67,8 +67,7 @@
 
 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_stamp)
 
 
 # This is to generate plugin .hg files.  A few variables are defined (in make
@@ -77,14 +76,8 @@
 # produces the final .hg file.
 $(files_plugin_hg_with_path): $(generate_plugin_gmmproc_file_path) \
 	$(tools_plugin_m4) $(files_defs)
-	$(eval plugin_hg_without_path = $$(notdir $@))
-	$(eval plugin_mktemp_output = \
-		$$(shell mktemp -t $$(plugin_hg_without_path).XXXXX))
-	$(eval plugin_hg_tmp_file = $(plugin_mktemp_output))
 	$(run_generate_plugin_gmmproc_file) --hg \
-		$(subst .hg,,$(plugin_hg_without_path)) >  $(plugin_hg_tmp_file)
-	$(M4) -I $(tools_dir_m4) $(plugin_hg_tmp_file) > $@
-	rm -f $(plugin_hg_tmp_file)
+		$(subst .hg,,$(notdir $@)) | $(M4) -I $(tools_dir_m4) > $@
 
 # This is to generate plugin .ccg files.
 $(files_plugin_hg_with_path:.hg=.ccg): $(generate_plugin_gmmproc_file_path) \
@@ -131,12 +124,14 @@
 	@(test -d $(destdir_stamp_dir) || mkdir $(destdir_stamp_dir))
 
 if MAINTAINER_MODE
-all-local: create-stamp-dir $(files_stamp) $(files_plugin_stamp) \
+all-local: create-stamp-dir $(files_stamp) $(files_plugin_hg_with_path) \
+	$(files_plugin_hg_with_path:.hg=.ccg) $(files_plugin_stamp) \
 	$(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc \
 	$(destdir_files_stamp)
 else
-BUILT_SOURCES = $(foreach plugin,$(files_plugin_hg:.hg=),\
-		$(stamp_plugin_dir)/stamp-$(plugin)-plugin)
+BUILT_SOURCES = $(files_plugin_hg_with_path) \
+		$(files_plugin_hg_with_path:.hg=.ccg) $(files_plugin_stamp) \
+		$(gensrc_destdir)/wrap_init.cc
 endif
 
 maintainer-clean-local:

Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	Tue Dec 16 05:50:16 2008
@@ -25,6 +25,6 @@
 
 lib_LTLIBRARIES = libgstreamermm-0.10.la
 libgstreamermm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
-nodist_libgstreamermm_0_10_la_SOURCES = $(files_plugin_built_cc)
+nodist_libgstreamermm_0_10_la_SOURCES = $(files_plugin_built_cc) wrap_init.cc
 libgstreamermm_0_10_la_LDFLAGS = $(common_ldflags)
 libgstreamermm_0_10_la_LIBADD  = $(GSTREAMERMM_LIBS)

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm/Makefile.am	Tue Dec 16 05:50:16 2008
@@ -25,6 +25,7 @@
 
 lib_LTLIBRARIES = libgstreamerbasemm-0.10.la
 libgstreamerbasemm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
-nodist_libgstreamerbasemm_0_10_la_SOURCES = $(files_plugin_built_cc)
+nodist_libgstreamerbasemm_0_10_la_SOURCES = $(files_plugin_built_cc) \
+					    wrap_init.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/tools/m4/Makefile.am
==============================================================================
--- gstreamermm/trunk/tools/m4/Makefile.am	(original)
+++ gstreamermm/trunk/tools/m4/Makefile.am	Tue Dec 16 05:50:16 2008
@@ -1,7 +1,8 @@
 
 include $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment
 
-EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_m4)
+EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_m4) \
+	     $(files_tools_plugin_m4)
 
 # Install the .m4, files: