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

[cascardo/ovs.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 4628c9b..c44a77f 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -139,7 +139,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ofp-print.c \
        lib/ofp-print.h \
        lib/ofp-util.c \
-       lib/ofp-util.def \
        lib/ofp-util.h \
        lib/ofp-version-opt.h \
        lib/ofp-version-opt.c \
@@ -150,9 +149,12 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ovs-atomic-flag-gcc4.7+.h \
        lib/ovs-atomic-gcc4+.h \
        lib/ovs-atomic-gcc4.7+.h \
+       lib/ovs-atomic-i586.h \
        lib/ovs-atomic-locked.c \
        lib/ovs-atomic-locked.h \
+       lib/ovs-atomic-msvc.h \
        lib/ovs-atomic-pthreads.h \
+       lib/ovs-atomic-x86_64.h \
        lib/ovs-atomic.h \
        lib/ovs-rcu.c \
        lib/ovs-rcu.h \
@@ -187,6 +189,11 @@ lib_libopenvswitch_la_SOURCES = \
        lib/rconn.h \
        lib/reconnect.c \
        lib/reconnect.h \
+       lib/rstp.c \
+       lib/rstp.h \
+       lib/rstp-common.h \
+       lib/rstp-state-machines.c \
+       lib/rstp-state-machines.h \
        lib/sat-math.h \
        lib/seq.c \
        lib/seq.h \
@@ -300,8 +307,8 @@ endif
 
 if LINUX
 lib_libopenvswitch_la_SOURCES += \
-       lib/dpif-linux.c \
-       lib/dpif-linux.h \
+       lib/dpif-netlink.c \
+       lib/dpif-netlink.h \
        lib/netdev-linux.c \
        lib/netdev-linux.h \
        lib/netlink-notifier.c \
@@ -309,6 +316,8 @@ lib_libopenvswitch_la_SOURCES += \
        lib/netlink-protocol.h \
        lib/netlink-socket.c \
        lib/netlink-socket.h \
+       lib/ovs-numa.c \
+       lib/ovs-numa.h \
        lib/rtnetlink-link.c \
        lib/rtnetlink-link.h \
        lib/route-table.c \
@@ -323,6 +332,8 @@ endif
 
 if WIN32
 lib_libopenvswitch_la_SOURCES += \
+       lib/dpif-netlink.c \
+       lib/dpif-netlink.h \
        lib/netlink-notifier.c \
        lib/netlink-notifier.h \
        lib/netlink-protocol.h \
@@ -353,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
@@ -409,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
@@ -417,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' \
@@ -429,22 +440,30 @@ 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
+       $(AM_V_GEN)$(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@
+lib/ofp-actions.inc2: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
+       $(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
+
 $(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