sbin_PROGRAMS += vswitchd/ovs-vswitchd
-man_MANS += \
- vswitchd/ovs-vswitchd.8 \
- vswitchd/ovs-brcompatd.8
+man_MANS += vswitchd/ovs-vswitchd.8
DISTCLEANFILES += \
- vswitchd/ovs-vswitchd.8 \
- vswitchd/ovs-brcompatd.8
+ vswitchd/ovs-vswitchd.8
vswitchd_ovs_vswitchd_SOURCES = \
vswitchd/bridge.c \
vswitchd/ovs-vswitchd.c \
vswitchd/system-stats.c \
vswitchd/system-stats.h \
- vswitchd/vswitch-idl.c \
- vswitchd/vswitch-idl.h \
vswitchd/xenserver.c \
vswitchd/xenserver.h
vswitchd_ovs_vswitchd_LDADD = \
- ofproto/libofproto.a \
- lib/libsflow.a \
- lib/libopenvswitch.a \
+ ofproto/libofproto.la \
+ lib/libsflow.la \
+ lib/libopenvswitch.la \
$(SSL_LIBS)
-EXTRA_DIST += \
- vswitchd/ovs-vswitchd.8.in \
- vswitchd/INTERNALS
-
-if HAVE_NETLINK
-sbin_PROGRAMS += vswitchd/ovs-brcompatd
-vswitchd_ovs_brcompatd_SOURCES = \
- vswitchd/ovs-brcompatd.c \
- vswitchd/vswitch-idl.c \
- vswitchd/vswitch-idl.h
-vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-endif
-EXTRA_DIST += vswitchd/ovs-brcompatd.8.in
+EXTRA_DIST += vswitchd/INTERNALS
+MAN_ROOTS += vswitchd/ovs-vswitchd.8.in
# vswitch schema and IDL
-OVSIDL_BUILT += \
- vswitchd/vswitch-idl.c \
- vswitchd/vswitch-idl.h \
- vswitchd/vswitch-idl.ovsidl
-VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
-EXTRA_DIST += $(VSWITCH_IDL_FILES)
+EXTRA_DIST += vswitchd/vswitch.ovsschema
pkgdata_DATA += vswitchd/vswitch.ovsschema
-vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
- $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
- mv $@.tmp $@
# vswitch E-R diagram
#
-# There are two complications here. First, if "python" or "dot" is not
-# available, then we have to just use the existing diagram. Second, different
-# "dot" versions produce slightly different output for the same input, but we
-# don't want to gratuitously change vswitch.pic if someone tweaks the schema in
-# some minor way that doesn't affect the table structure. To avoid that we
-# store a checksum of vswitch.gv in vswitch.pic and only regenerate vswitch.pic
-# if vswitch.gv actually changes.
-$(srcdir)/vswitchd/vswitch.gv: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
+# If "python" or "dot" is not available, then we do not add graphical diagram
+# to the documentation.
if HAVE_PYTHON
- $(OVSDB_DOT) $(srcdir)/vswitchd/vswitch.ovsschema > $@
-else
- touch $@
-endif
-$(srcdir)/vswitchd/vswitch.pic: $(srcdir)/vswitchd/vswitch.gv ovsdb/dot2pic
if HAVE_DOT
- sum=`cksum < $(srcdir)/vswitchd/vswitch.gv`; \
- if grep "$$sum" $@ >/dev/null 2>&1; then \
- echo "vswitch.gv unchanged, not regenerating vswitch.pic"; \
- touch $@; \
- else \
- echo "regenerating vswitch.pic"; \
- (echo ".\\\" Generated from vswitch.gv with cksum \"$$sum\""; \
- dot -T plain < $(srcdir)/vswitchd/vswitch.gv \
- | $(srcdir)/ovsdb/dot2pic) > $@; \
- fi
-else
- touch $@
+vswitchd/vswitch.gv: ovsdb/ovsdb-dot.in 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
+VSWITCH_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
+DISTCLEANFILES += vswitchd/vswitch.gv vswitchd/vswitch.pic
+endif
endif
-EXTRA_DIST += vswitchd/vswitch.gv vswitchd/vswitch.pic
# vswitch schema documentation
EXTRA_DIST += vswitchd/vswitch.xml
-dist_man_MANS += vswitchd/ovs-vswitchd.conf.db.5
+DISTCLEANFILES += vswitchd/ovs-vswitchd.conf.db.5
+man_MANS += vswitchd/ovs-vswitchd.conf.db.5
vswitchd/ovs-vswitchd.conf.db.5: \
- ovsdb/ovsdb-doc.in vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
- $(srcdir)/vswitchd/vswitch.pic
+ ovsdb/ovsdb-doc vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
+ $(VSWITCH_PIC)
$(OVSDB_DOC) \
--title="ovs-vswitchd.conf.db" \
- --er-diagram=$(srcdir)/vswitchd/vswitch.pic \
+ $(VSWITCH_DOT_DIAGRAM_ARG) \
+ --version=$(VERSION) \
$(srcdir)/vswitchd/vswitch.ovsschema \
$(srcdir)/vswitchd/vswitch.xml > $@.tmp
mv $@.tmp $@
exit 1; \
fi
CLEANFILES += vswitchd/vswitch.ovsschema.stamp
+
+# Clean up generated files from older OVS versions. (This is important so that
+# #include "vswitch-idl.h" doesn't get the wrong copy.)
+CLEANFILES += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h