[gnome-bluetooth] Support silent build rules with automake 1.11 (GnomeBug:592213)



commit 6d1176da88ce86aebbf81529754c8f865ee2a386
Author: Javier Jardón <javierjc1982 gmail com>
Date:   Tue Aug 18 18:47:59 2009 +0200

    Support silent build rules with automake 1.11 (GnomeBug:592213)
    
    Support silent build rules, requires at least automake-1.11.
    Disble by either passing --disable-silent-rules to configure or
    passing V=1 to make.

 configure.ac    |    5 +++++
 lib/Makefile.am |   16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5db3c43..d53def8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,11 @@ AC_SUBST(GNOMEBT_LT_VERSION)
 
 AM_MAINTAINER_MODE
 
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_LANG_C
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f612ca9..5580bfe 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -56,7 +56,7 @@ GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES)
 GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS)
 GnomeBluetooth-1.0.gir: libgnome-bluetooth.la
 GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER)
-	$(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \
+	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \
 		--add-include-path=$(srcdir) --add-include-path=. \
 		--include=GObject-2.0 \
 		--include=Gtk-2.0 \
@@ -120,19 +120,19 @@ EXTRA_DIST += marshal.list \
 MAINTAINERCLEANFILES = Makefile.in
 
 marshal.h: marshal.list
-	$(GLIB_GENMARSHAL) --prefix=marshal $< --header > $@
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=marshal $< --header > $@
 
 marshal.c: marshal.list
-	$(GLIB_GENMARSHAL) --prefix=marshal $< --header --body > $@
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=marshal $< --header --body > $@
 
 bluetooth-client-glue.h: bluetooth-client.xml bluetooth-agent.h bluetooth-agent.c
-	$(DBUS_BINDING_TOOL) --prefix=bluetooth_client --mode=glib-client --output=$@ $<
+	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=bluetooth_client --mode=glib-client --output=$@ $<
 
 bluetooth-agent-glue.h: bluetooth-agent.xml bluetooth-agent.h bluetooth-agent.c
-	$(DBUS_BINDING_TOOL) --prefix=bluetooth_agent --mode=glib-server --output=$@ $<
+	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=bluetooth_agent --mode=glib-server --output=$@ $<
 
 obex-agent-glue.h: obex-agent.xml
-	$(DBUS_BINDING_TOOL) --prefix=obex_agent --mode=glib-server --output=$@ $<
+	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=obex_agent --mode=glib-server --output=$@ $<
 
 gnome_bluetooth_headers_to_scan_for_enums = bluetooth-enums.h
 # Generate the enums source code, with glib-mkenums:
@@ -144,7 +144,7 @@ gnome_bluetooth_built_cfiles = gnome-bluetooth-enum-types.c
 $(OBJECTS) $(libgnomevfs_2_la_OBJECTS): $(libgnomevfs_built_headers)
 
 gnome-bluetooth-enum-types.h: $(gnome_bluetooth_headers_to_scan_for_enums) Makefile
-	(cd $(srcdir) && glib-mkenums \
+	$(AM_V_GEN) (cd $(srcdir) && glib-mkenums \
 			--fhead "#ifndef __GNOME_BLUETOOTH_ENUM_TYPES_H__\n#define __GNOME_BLUETOOTH_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define BLUETOOTH_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
@@ -152,7 +152,7 @@ gnome-bluetooth-enum-types.h: $(gnome_bluetooth_headers_to_scan_for_enums) Makef
 		$(gnome_bluetooth_headers_to_scan_for_enums)) > $@
 
 gnome-bluetooth-enum-types.c: $(gnome_bluetooth_headers_to_scan_for_enums) Makefile gnome-bluetooth-enum-types.h
-	(cd $(srcdir) && glib-mkenums \
+	$(AM_V_GEN) (cd $(srcdir) && glib-mkenums \
 			--fhead "#include <bluetooth-enums.h>\n" \
 			--fhead "#include \"gnome-bluetooth-enum-types.h\"\n" \
 			--fhead "#include \"bluetooth-enums.h\"\n" \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]