ovs-vswitchd: Export system stats through Open_vSwitch table.

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

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index c38add6..1a4b465 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -1,4 +1,4 @@
-sbin_PROGRAMS += vswitchd/ovs-vswitchd vswitchd/ovs-brcompatd
+sbin_PROGRAMS += vswitchd/ovs-vswitchd
 man_MANS += \
        vswitchd/ovs-vswitchd.8 \
        vswitchd/ovs-brcompatd.8
@@ -12,6 +12,7 @@ vswitchd_ovs_vswitchd_SOURCES = \
        vswitchd/proc-net-compat.c \
        vswitchd/proc-net-compat.h \
        vswitchd/ovs-vswitchd.c \
+       vswitchd/system-stats.c \
        vswitchd/vswitch-idl.c \
        vswitchd/vswitch-idl.h \
        vswitchd/xenserver.c \
@@ -21,18 +22,19 @@ vswitchd_ovs_vswitchd_LDADD = \
        lib/libsflow.a \
        lib/libopenvswitch.a \
        $(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)
-
-EXTRA_DIST += \
-       vswitchd/ovs-vswitchd.8.in \
-       vswitchd/ovs-brcompatd.8.in
-
+endif
+EXTRA_DIST += vswitchd/ovs-brcompatd.8.in
 
 # vswitch schema and IDL
 OVSIDL_BUILT += \
@@ -40,8 +42,36 @@ OVSIDL_BUILT += \
        vswitchd/vswitch-idl.h \
        vswitchd/vswitch-idl.ovsidl
 VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
-noinst_DATA += vswitchd/vswitch-idl.txt
-EXTRA_DIST += $(VSWITCH_IDL_FILES) vswitchd/vswitch-idl.txt
+EXTRA_DIST += $(VSWITCH_IDL_FILES)
 vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
        $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
        mv $@.tmp $@
+
+# vswitch E-R diagram
+if BUILD_ER_DIAGRAMS
+$(srcdir)/vswitchd/vswitch.pic: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
+       $(OVSDB_DOT) $(srcdir)/vswitchd/vswitch.ovsschema \
+               | dot -T pic \
+               | sed -e "/^'/d" \
+                     -e '/^box attrs0/d' \
+                     -e 's/linethick = 0;/linethick = 1;/' \
+               > $@.tmp
+       mv $@.tmp $@
+else
+$(srcdir)/vswitchd/vswitch.pic: ovsdb/ovsdb-dot.in vswitchd/vswitch.ovsschema
+       touch $@
+endif
+EXTRA_DIST += vswitchd/vswitch.pic
+
+# vswitch schema documentation
+EXTRA_DIST += vswitchd/vswitch.xml
+dist_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_DOC) \
+               --title="ovs-vswitchd.conf.db" \
+               --er-diagram=$(srcdir)/vswitchd/vswitch.pic \
+               $(srcdir)/vswitchd/vswitch.ovsschema \
+               $(srcdir)/vswitchd/vswitch.xml > $@.tmp
+       mv $@.tmp $@