[gstreamermm] Unbreak build with silent rules enabled
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gstreamermm] Unbreak build with silent rules enabled
- Date: Tue, 6 Oct 2009 10:13:14 +0000 (UTC)
commit 832864163fc9184af86b2e13f659dcebc0642c9f
Author: Daniel Elstner <daniel kitta gmail com>
Date: Tue Oct 6 11:54:51 2009 +0200
Unbreak build with silent rules enabled
* gstreamer/src/Makefile.am: Remove a left-over shell statement
just before the $(AM_V_GEN) substitution in the rule to build the
plugin source files.
ChangeLog | 8 ++++++++
gstreamer/src/Makefile.am | 5 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 68d96b6..df5ac47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-10-06 Daniel Elstner <daniel kitta gmail com>
+ Unbreak build with silent rules enabled
+
+ * gstreamer/src/Makefile.am: Remove a left-over shell statement
+ just before the $(AM_V_GEN) substitution in the rule to build the
+ plugin source files.
+
+2009-10-06 Daniel Elstner <daniel kitta gmail com>
+
Streamline configure check for gstreamer plugins
* configure.ac (GSTREAMERMM_PLUGIN_DEFS): Un-indent, as this a shell
diff --git a/gstreamer/src/Makefile.am b/gstreamer/src/Makefile.am
index 360c4dd..f79441b 100644
--- a/gstreamer/src/Makefile.am
+++ b/gstreamer/src/Makefile.am
@@ -24,6 +24,8 @@ include $(top_srcdir)/build/generate-binding.am
other_built_sources += $(binding_outputdir)/gst_wrap_init.cc
MAINTAINERCLEANFILES += $(addprefix $(srcdir)/,$(plugins_ccg) $(plugins_hg))
+generate_gst_wrap_init = $(codegen_srcdir)/generate_gst_wrap_init.pl
+
generate_plugin_gmmproc_file = \
$(top_builddir)/tools/extra_defs_gen/generate_plugin_gmmproc_file$(EXEEXT) \
--namespace=Gst --main-defs=gst --target=gstreamermm
@@ -31,8 +33,6 @@ generate_plugin_dependencies = \
$(codegen_srcdir)/extra_defs_gen/generate_plugin_gmmproc_file.cc \
$(addprefix $(codegen_m4_srcdir)/,$(files_plugin_m4))
-generate_gst_wrap_init = $(top_srcdir)/tools/generate_gst_wrap_init.pl
-
target_plugin = $(patsubst %element,%,$(basename $(notdir $@)))
target_plugin_def = $(subst =, ,$(filter $(target_plugin)=%,$(GSTREAMERMM_PLUGIN_DEFS)))
@@ -44,7 +44,6 @@ $(binding_outputdir)/gst_wrap_init.cc: $(generate_gst_wrap_init) $(binding_relfi
# through m4 using the macros in tools/m4/ctocpp_base.m4 which then produces
# the final .ccg file.
$(addprefix $(srcdir)/,$(plugins_ccg)): $(generate_plugin_dependencies)
- @plugin='$(firstword $(target_plugin_def))'; \
$(AM_V_GEN)$(generate_plugin_gmmproc_file) --ccg $(target_plugin_def) \
| $(M4) -I $(codegen_m4_srcdir) >$@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]