GNOME.org
 

[libbonobo] Enable silent build using AM_SILENT_RULES

commit dd6386bfd8c3c0da0106300a51ad1e11975b7d6c
Author: Christian Persch <chpe gnome org>
Date:   Sat Oct 3 23:24:25 2009 +0200

    Enable silent build using AM_SILENT_RULES

 activation-server/Makefile.am     |   12 ++++++------
 bonobo-activation/Makefile.am     |    7 ++-----
 bonobo/Makefile.am                |   10 +++++-----
 configure.in                      |    3 +++
 doc/api/figures/Makefile.am       |    2 +-
 idl/Makefile.am                   |    2 +-
 monikers/Makefile.am              |    2 +-
 samples/echo/Makefile.am          |    4 ++--
 tests/test-activation/Makefile.am |    8 ++++----
 9 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am
index a1d4c54..efb18a8 100644
--- a/activation-server/Makefile.am
+++ b/activation-server/Makefile.am
@@ -60,7 +60,7 @@ TESTS=test-performance
 
 serverinfodir=$(libdir)/bonobo/servers
 $(server_in_file): $(server_in_file).in
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN) $(SED) -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 server_in_file = Bonobo_CosNaming_NamingContext.server.in
 serverinfo_DATA = $(server_in_file:.server.in=.server)
 
@@ -73,19 +73,19 @@ EXTRA_DIST=activation-context-query-lexer.l activation-context-query-parser.y \
 YFLAGS = -d -v
 
 activation-context-query-lexer.c: $(srcdir)/activation-context-query-lexer.l activation-context-query-parser.h
-	@rm -f $@
+	$(AM_V_GEN) rm -f $@ && \
 	$(LEX) -t $(srcdir)/activation-context-query-lexer.l >$@
 
 stamp-parser: $(srcdir)/activation-context-query-parser.y
-	$(YACC) $(YFLAGS) $(srcdir)/activation-context-query-parser.y
-	rm -f y.output
+	$(AM_V_GEN) $(YACC) $(YFLAGS) $(srcdir)/activation-context-query-parser.y && \
+	rm -f y.output && \
 	touch $@
 
 activation-context-query-parser.c: stamp-parser
-	test -f y.tab.c && mv -f y.tab.c activation-context-query-parser.c || touch $@
+	$(AM_V_GEN) test -f y.tab.c && mv -f y.tab.c activation-context-query-parser.c || touch $@
 
 activation-context-query-parser.h: stamp-parser
-	test -f y.tab.h && mv -f y.tab.h activation-context-query-parser.h || touch $@
+	$(AM_V_GEN) test -f y.tab.h && mv -f y.tab.h activation-context-query-parser.h || touch $@
 
 BUILT_SOURCES= activation-context-query-lexer.c activation-context-query-parser.c \
 	activation-context-query-parser.h Bonobo_CosNaming_NamingContext.server
diff --git a/bonobo-activation/Makefile.am b/bonobo-activation/Makefile.am
index ddb3ef2..9e1925c 100644
--- a/bonobo-activation/Makefile.am
+++ b/bonobo-activation/Makefile.am
@@ -82,11 +82,8 @@ BUILT_SOURCES= $(IDL_HEADER_FILES) $(IDL_COMMONS) $(IDL_SKELS) $(IDL_STUBS) \
 $(libbonobo_activation_la_OBJECTS): $(BUILT_SOURCES)
 
 %.h %-stubs.c %-skels.c %-common.c %-imodule.c %-skelimpl.c: $(IDL_DIR)%.idl $(ORBIT_IDL)
-	echo "top_srcdir: $(top_srcdir)"
-	echo "IDL_DIR: $(IDL_DIR)"
-	echo "IDL file: $<"
-	-(rm -f $(*).h $(*)-stubs.c $(*)-skels.c $(*)-common.c $(*)-imodule.c $(*)-skelimpl.c || true) > /dev/null
-	$(ORBIT_IDL) $(IDL_FLAGS) "-D__$(*)_COMPILATION" --deps $(*D)/.deps/$(*F).idl.P $<
+	@-(rm -f $(*).h $(*)-stubs.c $(*)-skels.c $(*)-common.c $(*)-imodule.c $(*)-skelimpl.c || true) > /dev/null
+	$(AM_V_GEN) $(ORBIT_IDL) $(IDL_FLAGS) "-D__$(*)_COMPILATION" --deps $(*D)/.deps/$(*F).idl.P $<
 
 if MAINTAINER_MODE
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
diff --git a/bonobo/Makefile.am b/bonobo/Makefile.am
index d039d03..38d6f6c 100644
--- a/bonobo/Makefile.am
+++ b/bonobo/Makefile.am
@@ -47,7 +47,7 @@ idls =							\
 idl_flags = -I$(top_srcdir)/idl -D__Bonobo_COMPILATION
 
 $(CORBA_SOURCE): $(idls) $(ORBIT_IDL)
-	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/idl/Bonobo.idl
+	$(AM_V_GEN) $(ORBIT_IDL) $(idl_flags) $(top_srcdir)/idl/Bonobo.idl
 
 lib_LTLIBRARIES = libbonobo-2.la
 
@@ -148,10 +148,10 @@ marshal_sources = \
 	bonobo-marshal.c \
 	bonobo-marshal.h
 
-bonobo-marshal.h: bonobo-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=bonobo_marshal > $@
-bonobo-marshal.c: bonobo-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --body --prefix=bonobo_marshal > $@
+bonobo-marshal.h: bonobo-marshal.list Makefile
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=bonobo_marshal > $@
+bonobo-marshal.c: bonobo-marshal.list Makefile
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --body --prefix=bonobo_marshal > $@
 
 EXTRA_DIST = libbonobo-2.0.pc.in libbonobo-2.0-uninstalled.pc.in bonobo-marshal.list
 
diff --git a/configure.in b/configure.in
index 4608264..01dacb0 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,8 @@ AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 BONOBO_MAJOR_VERSION=bonobo_major_version
 BONOBO_MINOR_VERSION=bonobo_minor_version
 BONOBO_MICRO_VERSION=bonobo_micro_version
@@ -67,6 +69,7 @@ fi
 
 AC_ISC_POSIX
 AC_PROG_CC
+AC_PROG_SED
 
 AM_PROG_LEX
 if [[ "$LEX" != "flex" ]]; then
diff --git a/doc/api/figures/Makefile.am b/doc/api/figures/Makefile.am
index 02020ed..469aae6 100644
--- a/doc/api/figures/Makefile.am
+++ b/doc/api/figures/Makefile.am
@@ -12,7 +12,7 @@ all-local: $(diagrams_png)
 # NOTE: make sure you have dia >= 0.91 and DISPLAY set
 # NOTE: if you edit the dia files, save them UNcompressed!
 %.png: %.dia
-	@dia $< -e $@ 2> /dev/null || true
+	$(AM_V_GEN) dia $< -e $@ 2> /dev/null || true
 
 
 EXTRA_DIST = $(diagrams) $(diagrams_png)
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 1afc84a..3dc421a 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -63,7 +63,7 @@ Bonobo_module_la_LDFLAGS = \
 	-module -avoid-version -no-undefined
 
 $(IMODULE_SOURCE): $(idl_DATA) $(ORBIT_IDL)
-	$(ORBIT_IDL) $(idl_flags) --imodule $(top_srcdir)/idl/Bonobo.idl
+	$(AM_V_GEN) $(ORBIT_IDL) $(idl_flags) --imodule $(top_srcdir)/idl/Bonobo.idl
 
 BUILT_SOURCES = $(IMODULE_SOURCE)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/monikers/Makefile.am b/monikers/Makefile.am
index 2ca7743..c47b20b 100644
--- a/monikers/Makefile.am
+++ b/monikers/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
 	-DVERSION=\"$(VERSION)\"
 
 Bonobo_Moniker_std.server.in: Bonobo_Moniker_std.server.in.in
-	sed -e "s|\ MONIKER_LIBDIR\@|$(monikerdir_in_server_file)|" -e "s|\ SOPREFIX\@|$(SOPREFIX)|" $< > $@
+	$(AM_V_GEN) $(SED) -e "s|\ MONIKER_LIBDIR\@|$(monikerdir_in_server_file)|" -e "s|\ SOPREFIX\@|$(SOPREFIX)|" $< > $@
 
 CLEANFILES = Bonobo_Moniker_std.server Bonobo_Moniker_std.server.in
 
diff --git a/samples/echo/Makefile.am b/samples/echo/Makefile.am
index fd89f64..d56f7a9 100644
--- a/samples/echo/Makefile.am
+++ b/samples/echo/Makefile.am
@@ -5,7 +5,7 @@
 server_dot_in=Bonobo_Sample_Echo.server.in
 
 $(server_dot_in): $(server_dot_in).in
-	sed -e "s|\ prefix\@|$(prefix)|" $< > $@
+	$(AM_V_GEN) $(SED) -e "s|\ prefix\@|$(prefix)|" $< > $@
 
 samplesdir = $(libdir)/bonobo-2.0/samples
 samples_PROGRAMS = bonobo-echo-2
@@ -40,7 +40,7 @@ ECHO_CORBA_GENERATED =				\
 libEcho_a_SOURCES = $(ECHO_CORBA_GENERATED)
 
 $(ECHO_CORBA_GENERATED): Bonobo_Sample_Echo.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) -I$(top_srcdir)/idl $(srcdir)/Bonobo_Sample_Echo.idl
+	$(AM_V_GEN) $(ORBIT_IDL) -I$(top_srcdir)/idl $(srcdir)/Bonobo_Sample_Echo.idl
 
 serverdir = $(libdir)/bonobo/servers
 server_in_files = $(server_dot_in)
diff --git a/tests/test-activation/Makefile.am b/tests/test-activation/Makefile.am
index b670bb6..c90d1ba 100644
--- a/tests/test-activation/Makefile.am
+++ b/tests/test-activation/Makefile.am
@@ -64,12 +64,12 @@ empty.h empty-common.c empty-stubs.c empty-skels.c: empty_built
 plugin.h plugin-common.c plugin-stubs.c plugin-skels.c: plugin_built
 
 empty_built: empty.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/empty.idl
-	touch empty_built
+	$(AM_V_GEN) $(ORBIT_IDL) $(srcdir)/empty.idl
+	@touch empty_built
 
 plugin_built: plugin.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/plugin.idl
-	touch plugin_built
+	$(AM_V_GEN) $(ORBIT_IDL) $(srcdir)/plugin.idl
+	@touch plugin_built
 
 CLEANFILES=empty_built plugin_built $(BUILT_SOURCES)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]