netdev: Log a warning when netdev_set_config() fails.

[sliver-openvswitch.git] / vswitchd / automake.mk

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 7d1ff5d..02d413e 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -30,11 +30,11 @@ pkgdata_DATA += vswitchd/vswitch.ovsschema
 if HAVE_PYTHON
 if HAVE_DOT
 vswitchd/vswitch.gv: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
-       $(OVSDB_DOT) $(srcdir)/vswitchd/vswitch.ovsschema > $@
+       $(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) > $@;
 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
@@ -48,7 +48,7 @@ vswitchd/ovs-vswitchd.conf.db.5: \
        $(VSWITCH_PIC)
        $(OVSDB_DOC) \
                --title="ovs-vswitchd.conf.db" \
-               $(OVSDB_DOT_DIAGRAM_ARG) \
+               $(VSWITCH_DOT_DIAGRAM_ARG) \
                --version=$(VERSION) \
                $(srcdir)/vswitchd/vswitch.ovsschema \
                $(srcdir)/vswitchd/vswitch.xml > $@.tmp