[libsigc++2] Support Automake silent rules
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libsigc++2] Support Automake silent rules
- Date: Sat, 19 Sep 2009 02:47:17 +0000 (UTC)
commit db56ad989bbaa3840610dc80af5090272f896912
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sat Sep 19 03:14:24 2009 +0200
Support Automake silent rules
* configure.ac: Call the AM_SILENT_RULES macro if it is defined.
* docs/doc-manual.am, sigc++/Makefile.am: Prefix the commands of
custom rules with $(AM_V_GEN) or $(AM_V_at) in order to support
the silent rules feature of Automake.
ChangeLog | 9 +++++++++
configure.ac | 1 +
docs/doc-manual.am | 12 ++++++------
sigc++/Makefile.am | 6 +++---
4 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 218f3ec..7c307dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-19 Daniel Elstner <daniel kitta gmail com>
+
+ Support Automake silent rules
+
+ * configure.ac: Call the AM_SILENT_RULES macro if it is defined.
+ * docs/doc-manual.am, sigc++/Makefile.am: Prefix the commands of
+ custom rules with $(AM_V_GEN) or $(AM_V_at) in order to support
+ the silent rules feature of Automake.
+
2009-09-17 Michael Hasselmann <michaelh openismus com>
Documentation cleanup: sigc::hide() always only hides one signal argument
diff --git a/configure.ac b/configure.ac
index f9b6cd1..28997d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_HEADERS([config.h sigc++config.h])
AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-pax])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AM_MAINTAINER_MODE
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
diff --git a/docs/doc-manual.am b/docs/doc-manual.am
index b5bac34..8650987 100644
--- a/docs/doc-manual.am
+++ b/docs/doc-manual.am
@@ -32,15 +32,15 @@ manual_srcfile = $(srcdir)/manual/libsigc_manual.xml
reference/html/%: | manual/html/index.html
manual/html/index.html: $(manual_srcfile)
- -rm -f manual/html/*
- $(MKDIR_P) manual/html
- xsltproc -o 'manual/html/' --catalogs '$(DOCBOOK_STYLESHEET)' $(manual_srcfile)
+ -$(AM_V_at)rm -f manual/html/*
+ $(AM_V_at)$(MKDIR_P) manual/html
+ $(AM_V_GEN)xsltproc -o manual/html/ --catalogs '$(DOCBOOK_STYLESHEET)' $(manual_srcfile)
manual/libsigc_manual.dvi: $(manual_srcfile)
- db2dvi -o manual $(manual_srcfile)
+ $(AM_V_GEN)db2dvi -o manual $(manual_srcfile)
manual/libsigc_manual.pdf: $(manual_srcfile)
- db2pdf -o manual $(manual_srcfile)
+ $(AM_V_GEN)db2pdf -o manual $(manual_srcfile)
manual/libsigc_manual.ps: $(manual_srcfile)
- db2ps -o manual $(manual_srcfile)
+ $(AM_V_GEN)db2ps -o manual $(manual_srcfile)
diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am
index 5809e54..caa9e15 100644
--- a/sigc++/Makefile.am
+++ b/sigc++/Makefile.am
@@ -52,7 +52,7 @@ MAINTAINERCLEANFILES = $(sigc_built_h) $(sigc_built_cc)
m4_dir = $(srcdir)/macros
$(build_subdirs):
- $(MKDIR_P) $@
+ $(AM_V_at)$(MKDIR_P) $@
signal.cc: \
signal.h \
@@ -77,7 +77,7 @@ functors/slot.cc: \
functors/functor_trait.h
%.h: macros/%.h.m4 $(m4_dir)/template.macros.m4 | $(build_subdirs)
- $(M4) -I $(m4_dir) -I macros $< >$@
+ $(AM_V_GEN)$(M4) -I $(m4_dir) -I macros $< >$@
%.cc: macros/%.cc.m4 $(m4_dir)/template.macros.m4 | $(build_subdirs)
- $(M4) -I $(m4_dir) -I macros $< >$@
+ $(AM_V_GEN)$(M4) -I $(m4_dir) -I macros $< >$@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]