Makefiles: Add $(AM_V_GEN) annotations to clean up "make" output.

The Open vSwitch "make" output was still pretty verbose even when
configured with --enable-silent-rules.  This cleans it up.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Joe Stringer <joestringer@nicira.com>

diff --git a/Makefile.am b/Makefile.am
index 4c48e73..56dada7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,7 +137,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
-       $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
+       $(AM_V_GEN)$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
            sed \
                -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
@@ -156,7 +156,7 @@ SUFFIXES += .in
        @if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
            chmod +x $@.tmp; \
        fi
-       $(AM_V_GEN) mv $@.tmp $@
+       $(AM_V_at) mv $@.tmp $@
 
 .PHONY: clean-pycov
 clean-pycov:

diff --git a/datapath-windows/include/automake.mk b/datapath-windows/include/automake.mk
index ac945cb..31f2fe2 100644 (file)
--- a/datapath-windows/include/automake.mk
+++ b/datapath-windows/include/automake.mk
@@ -3,7 +3,7 @@ BUILT_SOURCES += $(srcdir)/datapath-windows/include/OvsDpInterface.h
 $(srcdir)/datapath-windows/include/OvsDpInterface.h: \
          datapath/linux/compat/include/linux/openvswitch.h \
          build-aux/extract-odp-netlink-windows-dp-h
-       sed -f $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h < $< > $@
+       $(AM_V_GEN)sed -f $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h < $< > $@
 
 EXTRA_DIST += $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h
 

diff --git a/debian/automake.mk b/debian/automake.mk
index 86c1310..c29a560 100644 (file)
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -71,6 +71,7 @@ ALL_LOCAL += check-debian-changelog-version
 DIST_HOOKS += check-debian-changelog-version
 
 $(srcdir)/debian/copyright: AUTHORS debian/copyright.in
+       $(AM_V_GEN) \
        { sed -n -e '/%AUTHORS%/q' -e p < $(srcdir)/debian/copyright.in;   \
          sed '1,/^$$/d' $(srcdir)/AUTHORS |                               \
                sed -n -e '/^$$/q' -e 's/^/  /p';                          \

diff --git a/include/automake.mk b/include/automake.mk
index 55cb353..6a4cf86 100644 (file)
--- a/include/automake.mk
+++ b/include/automake.mk
@@ -2,7 +2,7 @@ BUILT_SOURCES += include/odp-netlink.h
 
 include/odp-netlink.h: datapath/linux/compat/include/linux/openvswitch.h \
                        build-aux/extract-odp-netlink-h
-       sed -f $(srcdir)/build-aux/extract-odp-netlink-h < $< > $@
+       $(AM_V_GEN)sed -f $(srcdir)/build-aux/extract-odp-netlink-h < $< > $@
 EXTRA_DIST += build-aux/extract-odp-netlink-h
 CLEANFILES += include/odp-netlink.h
 

diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk
index 2938642..14f7a47 100644 (file)
--- a/include/openflow/automake.mk
+++ b/include/openflow/automake.mk
@@ -12,7 +12,7 @@ if HAVE_PYTHON
 SUFFIXES += .h .hstamp
 
 .h.hstamp:
-       $(run_python) $(srcdir)/build-aux/check-structs -I$(srcdir)/include $<
+       $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/check-structs -I$(srcdir)/include $< && \
        touch $@
 
 HSTAMP_FILES = \

diff --git a/lib/automake.mk b/lib/automake.mk
index b83cceb..c44a77f 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -364,11 +364,11 @@ if HAVE_OPENSSL
 lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c
 nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c
 lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
-       (echo '#include "lib/dhparams.h"' &&                            \
+       $(AM_V_GEN)(echo '#include "lib/dhparams.h"' &&                 \
         openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout &&      \
         openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout &&      \
         openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout)        \
-       | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp
+       | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp &&  \
        mv lib/dhparams.c.tmp lib/dhparams.c
 else
 lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c
@@ -420,7 +420,7 @@ VSWITCH_IDL_FILES = \
        $(srcdir)/vswitchd/vswitch.ovsschema \
        $(srcdir)/lib/vswitch-idl.ann
 $(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
-       $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp && \
        mv $@.tmp $@
 
 EXTRA_DIST += $(srcdir)/lib/vtep-idl.ann
@@ -428,11 +428,11 @@ VTEP_IDL_FILES = \
        $(srcdir)/vtep/vtep.ovsschema \
        $(srcdir)/lib/vtep-idl.ann
 $(srcdir)/lib/vtep-idl.ovsidl: $(VTEP_IDL_FILES)
-       $(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp
+       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp && \
        mv $@.tmp $@
 
 lib/dirs.c: lib/dirs.c.in Makefile
-       ($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
+       $(AM_V_GEN)($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
                -e 's,[@]srcdir[@],$(srcdir),g' \
                -e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
                -e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
@@ -440,13 +440,13 @@ lib/dirs.c: lib/dirs.c.in Makefile
                -e 's,[@]bindir[@],"$(bindir)",g' \
                -e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
                -e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
-            > lib/dirs.c.tmp
+            > lib/dirs.c.tmp && \
        mv lib/dirs.c.tmp lib/dirs.c
 
 lib/ofp-actions.inc1: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
-       $(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN)$(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@
 lib/ofp-actions.inc2: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
-       $(run_python) $^ --definitions > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN)$(run_python) $^ --definitions > $@.tmp && mv $@.tmp $@
 lib/ofp-actions.lo: lib/ofp-actions.inc1 lib/ofp-actions.inc2
 CLEANFILES += lib/ofp-actions.inc1 lib/ofp-actions.inc2
 EXTRA_DIST += build-aux/extract-ofp-actions lib/ofp-errors.inc
@@ -454,16 +454,16 @@ EXTRA_DIST += build-aux/extract-ofp-actions lib/ofp-errors.inc
 $(srcdir)/lib/ofp-errors.inc: \
        lib/ofp-errors.h include/openflow/openflow-common.h \
        $(srcdir)/build-aux/extract-ofp-errors
-       $(run_python) $(srcdir)/build-aux/extract-ofp-errors \
+       $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-errors \
                $(srcdir)/lib/ofp-errors.h \
-               $(srcdir)/include/openflow/openflow-common.h > $@.tmp
+               $(srcdir)/include/openflow/openflow-common.h > $@.tmp && \
        mv $@.tmp $@
 $(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
 EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
 
 $(srcdir)/lib/ofp-msgs.inc: \
        lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs
-       $(run_python) $(srcdir)/build-aux/extract-ofp-msgs \
+       $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-msgs \
                $(srcdir)/lib/ofp-msgs.h $@ > $@.tmp && mv $@.tmp $@
 $(srcdir)/lib/ofp-msgs.c: $(srcdir)/lib/ofp-msgs.inc
 EXTRA_DIST += build-aux/extract-ofp-msgs lib/ofp-msgs.inc

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index d622b64..399f2b6 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2014 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -71,7 +71,7 @@ MAN_FRAGMENTS += ofproto/ofproto-unixctl.man ofproto/ofproto-dpif-unixctl.man
 EXTRA_DIST += ofproto/ipfix.xml
 dist_noinst_SCRIPTS = ofproto/ipfix-gen-entities
 ofproto/ipfix-entities.def: ofproto/ipfix.xml ofproto/ipfix-gen-entities
-       $(run_python) $(srcdir)/ofproto/ipfix-gen-entities $< > $@.tmp
+       $(AM_V_GEN)$(run_python) $(srcdir)/ofproto/ipfix-gen-entities $< > $@.tmp && \
        mv $@.tmp $@
 
 # IPFIX enterprise entity definition macros.

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 5b7495c..00a0b01 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -71,11 +71,9 @@ DISTCLEANFILES += ovsdb/ovsdb-idlc
 SUFFIXES += .ovsidl .ovsschema
 OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
-       $(OVSDB_IDLC) c-idl-source $< > $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)$(OVSDB_IDLC) c-idl-source $< > $@.tmp && mv $@.tmp $@
 .ovsidl.h:
-       $(OVSDB_IDLC) c-idl-header $< > $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)$(OVSDB_IDLC) c-idl-header $< > $@.tmp && mv $@.tmp $@
 
 EXTRA_DIST += $(OVSIDL_BUILT)
 BUILT_SOURCES += $(OVSIDL_BUILT)

diff --git a/python/automake.mk b/python/automake.mk
index c0f0db6..08e1204 100644 (file)
--- a/python/automake.mk
+++ b/python/automake.mk
@@ -68,13 +68,13 @@ ovs-uninstall-local:
 
 ALL_LOCAL += $(srcdir)/python/ovs/version.py
 $(srcdir)/python/ovs/version.py: config.status
-       $(ro_shell) > $(@F).tmp
-       echo 'VERSION = "$(VERSION)"' >> $(@F).tmp
+       $(AM_V_GEN)$(ro_shell) > $(@F).tmp && \
+       echo 'VERSION = "$(VERSION)"' >> $(@F).tmp && \
        if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
 
 ALL_LOCAL += $(srcdir)/python/ovs/dirs.py
 $(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
-       sed \
+       $(AM_V_GEN)sed \
                -e '/^##/d' \
                 -e 's,[@]pkgdatadir[@],/usr/local/share/openvswitch,g' \
                 -e 's,[@]RUNDIR[@],/var/run,g' \
@@ -82,6 +82,6 @@ $(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
                 -e 's,[@]bindir[@],/usr/local/bin,g' \
                 -e 's,[@]sysconfdir[@],/usr/local/etc,g' \
                 -e 's,[@]DBDIR[@],/usr/local/etc/openvswitch,g' \
-               < $? > $@.tmp
+               < $? > $@.tmp && \
        mv $@.tmp $@
 EXTRA_DIST += python/ovs/dirs.py python/ovs/dirs.py.template

diff --git a/rhel/automake.mk b/rhel/automake.mk
index 9cd9a41..9c3433b 100644 (file)
--- a/rhel/automake.mk
+++ b/rhel/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2014 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -27,7 +27,7 @@ EXTRA_DIST += \
        rhel/usr_lib_systemd_system_openvswitch-nonetwork.service
 
 update_rhel_spec = \
-  ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+  $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
     < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \
   if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
 

diff --git a/tests/automake.mk b/tests/automake.mk
index 9d32be9..1f13230 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -134,9 +134,9 @@ valgrind_wrappers = \
 
 $(valgrind_wrappers): tests/valgrind-wrapper.in
        @test -d tests/valgrind || mkdir tests/valgrind
-       sed -e 's,[@]wrap_program[@],$@,' \
-               $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
-       chmod +x $@.tmp
+       $(AM_V_GEN) sed -e 's,[@]wrap_program[@],$@,' \
+               $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp && \
+       chmod +x $@.tmp && \
        mv $@.tmp $@
 CLEANFILES += $(valgrind_wrappers)
 EXTRA_DIST += tests/valgrind-wrapper.in
@@ -156,12 +156,12 @@ check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) \
 # OFTest support.
 
 check-oftest: all
-       srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-oftest
+       $(AM_V_at)srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-oftest
 EXTRA_DIST += tests/run-oftest
 
 # Ryu support.
 check-ryu: all
-       srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-ryu
+       $(AM_V_at)srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-ryu
 EXTRA_DIST += tests/run-ryu
 \f
 clean-local:
@@ -169,12 +169,12 @@ clean-local:
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(TESTSUITE_AT)
-       $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
-       mv $@.tmp $@
+       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+       $(AM_V_at)mv $@.tmp $@
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
-       :;{ \
+       $(AM_V_GEN):;{ \
          echo '# Signature of the current package.' && \
          echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
          echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
@@ -196,7 +196,7 @@ OVSIDL_BUILT += tests/idltest.c tests/idltest.h tests/idltest.ovsidl
 IDLTEST_IDL_FILES = tests/idltest.ovsschema tests/idltest.ann
 EXTRA_DIST += $(IDLTEST_IDL_FILES)
 tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
-       $(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp
+       $(AM_V_GEN)$(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp && \
        mv $@.tmp $@
 
 tests/idltest.c: tests/idltest.h
@@ -284,21 +284,28 @@ TESTPKI_FILES = \
 check_DATA += $(TESTPKI_FILES)
 CLEANFILES += $(TESTPKI_FILES)
 
-tests/testpki-cacert.pem: tests/pki/stamp; cp tests/pki/switchca/cacert.pem $@
-tests/testpki-cert.pem: tests/pki/stamp; cp tests/pki/test-cert.pem $@
-tests/testpki-req.pem: tests/pki/stamp; cp tests/pki/test-req.pem $@
-tests/testpki-privkey.pem: tests/pki/stamp; cp tests/pki/test-privkey.pem $@
-tests/testpki-cert2.pem: tests/pki/stamp; cp tests/pki/test2-cert.pem $@
-tests/testpki-req2.pem: tests/pki/stamp; cp tests/pki/test2-req.pem $@
-tests/testpki-privkey2.pem: tests/pki/stamp; cp tests/pki/test2-privkey.pem $@
+tests/testpki-cacert.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/switchca/cacert.pem $@
+tests/testpki-cert.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/test-cert.pem $@
+tests/testpki-req.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/test-req.pem $@
+tests/testpki-privkey.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/test-privkey.pem $@
+tests/testpki-cert2.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/test2-cert.pem $@
+tests/testpki-req2.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/test2-req.pem $@
+tests/testpki-privkey2.pem: tests/pki/stamp
+       $(AM_V_GEN)cp tests/pki/test2-privkey.pem $@
 
 OVS_PKI = $(SHELL) $(srcdir)/utilities/ovs-pki.in --dir=tests/pki --log=tests/ovs-pki.log
 tests/pki/stamp:
-       rm -f tests/pki/stamp
-       rm -rf tests/pki
-       $(OVS_PKI) init
-       $(OVS_PKI) req+sign tests/pki/test
-       $(OVS_PKI) req+sign tests/pki/test2
+       $(AM_V_at)rm -f tests/pki/stamp
+       $(AM_V_at)rm -rf tests/pki
+       $(AM_V_GEN)$(OVS_PKI) init && \
+       $(OVS_PKI) req+sign tests/pki/test && \
+       $(OVS_PKI) req+sign tests/pki/test2 && \
        : > tests/pki/stamp
 CLEANFILES += tests/ovs-pki.log
 

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 2d43b9e..80affe9 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -30,9 +30,9 @@ pkgdata_DATA += vswitchd/vswitch.ovsschema
 if HAVE_PYTHON
 if HAVE_DOT
 vswitchd/vswitch.gv: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
-       $(OVSDB_DOT) --no-arrows $(srcdir)/vswitchd/vswitch.ovsschema > $@
+       $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/vswitchd/vswitch.ovsschema > $@
 vswitchd/vswitch.pic: vswitchd/vswitch.gv ovsdb/dot2pic
-       (dot -T plain < vswitchd/vswitch.gv | $(PERL) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp;
+       $(AM_V_GEN)(dot -T plain < vswitchd/vswitch.gv | $(PERL) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \
        mv $@.tmp $@
 VSWITCH_PIC = vswitchd/vswitch.pic
 VSWITCH_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
@@ -47,12 +47,12 @@ man_MANS += vswitchd/ovs-vswitchd.conf.db.5
 vswitchd/ovs-vswitchd.conf.db.5: \
        ovsdb/ovsdb-doc vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
        $(VSWITCH_PIC)
-       $(OVSDB_DOC) \
+       $(AM_V_GEN)$(OVSDB_DOC) \
                --title="ovs-vswitchd.conf.db" \
                $(VSWITCH_DOT_DIAGRAM_ARG) \
                --version=$(VERSION) \
                $(srcdir)/vswitchd/vswitch.ovsschema \
-               $(srcdir)/vswitchd/vswitch.xml > $@.tmp
+               $(srcdir)/vswitchd/vswitch.xml > $@.tmp && \
        mv $@.tmp $@
 
 # Version checking for vswitch.ovsschema.

diff --git a/vtep/automake.mk b/vtep/automake.mk
index ddf9455..360ed35 100644 (file)
--- a/vtep/automake.mk
+++ b/vtep/automake.mk
@@ -32,9 +32,9 @@ pkgdata_DATA += vtep/vtep.ovsschema
 if HAVE_PYTHON
 if HAVE_DOT
 vtep/vtep.gv: ovsdb/ovsdb-dot.in vtep/vtep.ovsschema
-       $(OVSDB_DOT) --no-arrows $(srcdir)/vtep/vtep.ovsschema > $@
+       $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/vtep/vtep.ovsschema > $@
 vtep/vtep.pic: vtep/vtep.gv ovsdb/dot2pic
-       (dot -T plain < vtep/vtep.gv | $(PERL) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp;
+       $(AM_V_GEN)(dot -T plain < vtep/vtep.gv | $(PERL) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \
        mv $@.tmp $@
 VTEP_PIC = vtep/vtep.pic
 VTEP_DOT_DIAGRAM_ARG = --er-diagram=$(VTEP_PIC)
@@ -48,12 +48,12 @@ DISTCLEANFILES += vtep/vtep.5
 man_MANS += vtep/vtep.5
 vtep/vtep.5: \
        ovsdb/ovsdb-doc vtep/vtep.xml vtep/vtep.ovsschema $(VTEP_PIC)
-       $(OVSDB_DOC) \
+       $(AM_V_GEN)$(OVSDB_DOC) \
                --title="vtep" \
                $(VTEP_DOT_DIAGRAM_ARG) \
                --version=$(VERSION) \
                $(srcdir)/vtep/vtep.ovsschema \
-               $(srcdir)/vtep/vtep.xml > $@.tmp
+               $(srcdir)/vtep/vtep.xml > $@.tmp && \
        mv $@.tmp $@
 
 # Version checking for vtep.ovsschema.

diff --git a/xenserver/automake.mk b/xenserver/automake.mk
index 413e634..816b1b5 100644 (file)
--- a/xenserver/automake.mk
+++ b/xenserver/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2014 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -27,6 +27,6 @@ EXTRA_DIST += \
        xenserver/usr_share_openvswitch_scripts_sysconfig.template
 
 $(srcdir)/xenserver/openvswitch-xen.spec: xenserver/openvswitch-xen.spec.in $(top_builddir)/config.status
-       ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+       $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
                < $(srcdir)/xenserver/$(@F).in > $(@F).tmp || exit 1; \
        if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi