Enable silent automake rules by default (if available).

diff --git a/configure.ac b/configure.ac
index 7ffe5a9164f7c4ebad02d9f3549c0802bb26d2b8..af72e21fd742dfd05b9b7b1307a0b4a381a01fb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ AC_CONFIG_HEADERS([src/config.h])
 AC_PREFIX_DEFAULT([/opt/sysdb])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])
 AC_PREFIX_DEFAULT([/opt/sysdb])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])

+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

 
 AC_LANG(C)
 
 
 AC_LANG(C)
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 433959ff2d6f18162908e4bcaa66e67d8d2fa4a3..48a9bcd71180291fb7c8da16ec9de67869e6e62e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -82,6 +82,14 @@ CLEANFILES = \
                sysdb.7.xml \
                sysdbql.7.xml
 
                sysdb.7.xml \
                sysdbql.7.xml
 

+V_ASCIIDOC = $(v_asciidoc_@AM_V@)
+v_asciidoc_ = $(v_asciidoc_@AM_DEFAULT_V@)
+v_asciidoc_0 = @echo "  ADOC    " $@;
+
+V_XMLTO = $(v_xmlto_@AM_V@)
+v_xmlto_ = $(v_xmlto_@AM_DEFAULT_V@)
+v_xmlto_0 = @echo "  XMLTO   " $@;
+

 man_MANS = \
                sysdb.1 \
                sysdbd.1 \
 man_MANS = \
                sysdb.1 \
                sysdbd.1 \


@@ -171,23 +179,23 @@ html-local: $(html_DATA)
 install-html-local: install-htmlDATA
 
 .1.txt.1.xml:
 install-html-local: install-htmlDATA
 
 .1.txt.1.xml:

-       @ASCIIDOC@ $(ADOC_FLAGS) -b docbook -d manpage -o $@ $<
+       $(V_ASCIIDOC)@ASCIIDOC@ $(ADOC_FLAGS) -b docbook -d manpage -o $@ $<

 .5.txt.5.xml:
 .5.txt.5.xml:

-       @ASCIIDOC@ $(ADOC_FLAGS) -b docbook -d manpage -o $@ $<
+       $(V_ASCIIDOC)@ASCIIDOC@ $(ADOC_FLAGS) -b docbook -d manpage -o $@ $<

 .7.txt.7.xml:
 .7.txt.7.xml:

-       @ASCIIDOC@ $(ADOC_FLAGS) -b docbook -d manpage -o $@ $<
+       $(V_ASCIIDOC)@ASCIIDOC@ $(ADOC_FLAGS) -b docbook -d manpage -o $@ $<

 
 .1.xml.1:
 
 .1.xml.1:

-       @XMLTO@ -o . man $<
+       $(V_XMLTO)@XMLTO@ -o . man $<

 .5.xml.5:
 .5.xml.5:

-       @XMLTO@ -o . man $<
+       $(V_XMLTO)@XMLTO@ -o . man $<

 .7.xml.7:
 .7.xml.7:

-       @XMLTO@ -o . man $<
+       $(V_XMLTO)@XMLTO@ -o . man $<

 
 .1.txt.1.html:
 
 .1.txt.1.html:

-       @ASCIIDOC@ $(ADOC_FLAGS) -b html5 -d manpage -o $@ $<
+       $(V_ASCIIDOC)@ASCIIDOC@ $(ADOC_FLAGS) -b html5 -d manpage -o $@ $<

 .5.txt.5.html:
 .5.txt.5.html:

-       @ASCIIDOC@ $(ADOC_FLAGS) -b html5 -d manpage -o $@ $<
+       $(V_ASCIIDOC)@ASCIIDOC@ $(ADOC_FLAGS) -b html5 -d manpage -o $@ $<

 .7.txt.7.html:
 .7.txt.7.html:

-       @ASCIIDOC@ $(ADOC_FLAGS) -b html5 -d manpage -o $@ $<
+       $(V_ASCIIDOC)@ASCIIDOC@ $(ADOC_FLAGS) -b html5 -d manpage -o $@ $<

 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 886cc1ad2d80d562db0bba0fe71d141bb9518c9a..177ee6fd8367da3a879f8e0cb2e009e25f03ee24 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -242,8 +242,8 @@ sysdbd_DEPENDENCIES += plugins/store/network.la
 endif
 
 include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version
 endif
 
 include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version

-       mkdir -p include/client
-       source $(abs_top_builddir)/version; sed \
+       @mkdir -p include/client
+       $(AM_V_GEN)source $(abs_top_builddir)/version; sed \

            -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
            -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
            -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
            -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
            -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
            -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \


@@ -253,8 +253,8 @@ include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version
            > include/client/sysdb.h
 
 include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version
            > include/client/sysdb.h
 
 include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version

-       mkdir -p include
-       source $(abs_top_builddir)/version; sed \
+       @mkdir -p include
+       $(AM_V_GEN)source $(abs_top_builddir)/version; sed \

            -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
            -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
            -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
            -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
            -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
            -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \


@@ -264,4 +264,4 @@ include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version
            > include/sysdb.h
 
 $(abs_top_builddir)/version:
            > include/sysdb.h
 
 $(abs_top_builddir)/version:

-       cd .. && make version
+       $(AM_V_GEN)cd .. && make version