[gstreamermm] Fix the build so that multi-job makes (option -j) are supported
- From: José Alburquerque <jaalburqu src gnome org>
- To: svn-commits-list gnome org
- Subject: [gstreamermm] Fix the build so that multi-job makes (option -j) are supported
- Date: Mon, 25 May 2009 02:53:10 -0400 (EDT)
commit aeabc33e61e6856f8d3894c07dd758aafa8b87c8
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Mon May 25 02:51:30 2009 -0400
Fix the build so that multi-job makes (option -j) are supported
---
ChangeLog | 5 +++++
build_shared/Makefile_gensrc.am_fragment | 22 +++++++++++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 815a818..ccef6f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-25 José Alburquerque <jaalburqu svn gnome org>
+
+ * build_shared/Makefile_gensrc.am_fragment: Fix the build so that
+ multi-job makes (option -j) are supported.
+
2009-05-24 José Alburquerque <jaalburqu svn gnome org>
* examples/optiongroup/main.cc:
diff --git a/build_shared/Makefile_gensrc.am_fragment b/build_shared/Makefile_gensrc.am_fragment
index e57a43d..8916d3c 100644
--- a/build_shared/Makefile_gensrc.am_fragment
+++ b/build_shared/Makefile_gensrc.am_fragment
@@ -91,11 +91,11 @@ $(files_all_plugin_camel_hg_with_path): $(generate_plugin_dep) \
$(eval hg_lowercase = \
$$(shell echo $$(cppname) | tr [:upper:] [:lower:]).hg)
if MAINTAINER_MODE
- if $(run_generate_plugin_gmmproc_file) --confirm-existence \
+ $(shell if $(run_generate_plugin_gmmproc_file) --confirm-existence \
$(plugin_name); then true; else \
echo "The $(plugin_name) gstreamer plugin is not installed. Aborting build. If you built gst-plugins-base from source code then you might need to install the appropriate -dev or --devel packages or enable experimenal plugins before rebuilding gst-plugins-base."; \
false; \
- fi
+ fi)
endif
sed -n '1,/^$$/p' $(license_header_source_file) > \
$(srcdir)/$(hg_lowercase)
@@ -106,7 +106,7 @@ endif
# This is to generate plugin .ccg files. The .ccg file is generated and then
# the camel ccg file is linked to the generated .ccg file to signal the
-# successful generation of the .hg file.
+# successful generation of the .ccg file.
$(files_all_plugin_camel_hg_with_path:.hg=.ccg): $(generate_plugin_dep) \
$(tools_plugin_m4) $(license_header_source_file)
$(eval cppname = $$(notdir $$(basename $$@)))
@@ -133,11 +133,19 @@ $(stamp_plugin_dir)/stamp-%-plugin: $(stamp_plugin_dir)/%.hg \
$(run_gmmproc) $(plugin_name_lowercase) $(srcdir) $(gensrc_destdir)
@echo 'timestamp' > $@
+files_patched_h_with_path = $(patsubst %.hg,$(gensrc_destdir)/%.h,\
+ $(files_patched_hg))
+
+# Rule to make sure that .h files exist in $(gensrc_destdir) before they are
+# patched.
+$(files_patched_h_with_path): $(files_stamp)
+ @echo $(run_gmmproc) $(notdir $(@:.h=)) $(srcdir) $(gensrc_destdir)
+
# This is to patch generated .h files in $(gensrc_destdir) (e.g. taglist.h).
$(destdir_stamp_dir)/stamp-%: $(gensrc_destdir)/%.h
patch -Ns $(gensrc_destdir)/$*.h $(gensrc_destdir)/$*.h.patch || true
rm -f $(gensrc_destdir)/$*.h.rej
- touch $@
+ @echo 'timestamp' > $@
files_hg_with_path = $(patsubst %.hg,$(srcdir)/%.hg,$(files_all_hg))
@@ -155,8 +163,12 @@ $(gensrc_destdir)/gst_wrap_init.cc: $(gen_gst_wrap_init_in) \
$(stamp_plugin_dir):
@(test -d $(stamp_plugin_dir) || mkdir $(stamp_plugin_dir))
-create-stamp-dir: $(stamp_plugin_dir)
+create-stamp-dir: $(stamp_plugin_dir) $(destdir_stamp_dir)
@(test -d $(stamp_dir) || mkdir $(stamp_dir))
+
+# This is to create the destdir .stamps directory to keep track of sources that
+# are patched after being generated (if any).
+$(destdir_stamp_dir):
@(test -d $(destdir_stamp_dir) || mkdir $(destdir_stamp_dir))
if MAINTAINER_MODE
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]