ovsdb-server: Refactoring and clean up remote status reporting.

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

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index fd291ef..8d7f3ea 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -15,6 +15,7 @@ vswitchd_ovs_vswitchd_LDADD = \
        ofproto/libofproto.la \
        lib/libsflow.la \
        lib/libopenvswitch.la
+vswitchd_ovs_vswitchd_LDFLAGS = $(AM_LDFLAGS) $(DPDK_vswitchd_LDFLAGS)
 EXTRA_DIST += vswitchd/INTERNALS
 MAN_ROOTS += vswitchd/ovs-vswitchd.8.in
 
@@ -29,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) 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)
@@ -46,26 +47,17 @@ 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) \
-               --title="ovs-vswitchd.conf.db" \
+       $(AM_V_GEN)$(OVSDB_DOC) \
                $(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.
 ALL_LOCAL += vswitchd/vswitch.ovsschema.stamp
 vswitchd/vswitch.ovsschema.stamp: vswitchd/vswitch.ovsschema
-       @sum=`sed '/cksum/d' $? | cksum`; \
-       expected=`sed -n 's/.*"cksum": "\(.*\)".*/\1/p' $?`; \
-       if test "X$$sum" = "X$$expected"; then \
-         touch $@; \
-       else \
-         ln=`sed -n '/"cksum":/=' $?`; \
-         echo >&2 "$?:$$ln: checksum \"$$sum\" does not match (you should probably update the version number and fix the checksum)"; \
-         exit 1; \
-       fi
+       $(srcdir)/build-aux/cksum-schema-check $? $@
 CLEANFILES += vswitchd/vswitch.ovsschema.stamp
 
 # Clean up generated files from older OVS versions.  (This is important so that