automake.mk: Improve schema checksum error message.

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

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index f80f754..81f201a 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -12,10 +12,10 @@ vswitchd_ovs_vswitchd_SOURCES = \
        vswitchd/xenserver.c \
        vswitchd/xenserver.h
 vswitchd_ovs_vswitchd_LDADD = \
-       ofproto/libofproto.a \
-       lib/libsflow.a \
-       lib/libopenvswitch.a \
-       $(SSL_LIBS)
+       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
 
@@ -30,11 +30,12 @@ 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 | $(srcdir)/ovsdb/dot2pic -f 3) > $@;
+       $(AM_V_GEN)(dot -T plain < vswitchd/vswitch.gv | $(PERL) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \
+       mv $@.tmp $@
 VSWITCH_PIC = vswitchd/vswitch.pic
-OVSDB_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
+VSWITCH_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
 DISTCLEANFILES += vswitchd/vswitch.gv vswitchd/vswitch.pic
 endif
 endif
@@ -46,12 +47,11 @@ 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" \
-               $(OVSDB_DOT_DIAGRAM_ARG) \
+       $(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.
@@ -63,7 +63,7 @@ vswitchd/vswitch.ovsschema.stamp: vswitchd/vswitch.ovsschema
          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)"; \
+         echo >&2 "$?:$$ln: The checksum \"$$sum\" was calculated from the schema file and does not match cksum field in the schema file - you should probably update the version number and the checksum in the schema file with the value listed here."; \
          exit 1; \
        fi
 CLEANFILES += vswitchd/vswitch.ovsschema.stamp