X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=6ef776349e233f59c63b916273ae849c80ff9d1b;hb=cd10ed7fb4fb5b1e3ed8e3fae1fd115c7ae96e77;hp=6c2019118828a8cedc015ba3db86f81eaa202a6d;hpb=4cdb08c02a3d3067194c659a442d3679cdd8dd35;p=openvswitch

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 6c201911..6ef77634 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -12,6 +12,8 @@ vswitchd_ovs_vswitchd_SOURCES = \
 	vswitchd/proc-net-compat.c \
 	vswitchd/proc-net-compat.h \
 	vswitchd/ovs-vswitchd.c \
+	vswitchd/system-stats.c \
+	vswitchd/system-stats.h \
 	vswitchd/vswitch-idl.c \
 	vswitchd/vswitch-idl.h \
 	vswitchd/xenserver.c \
@@ -46,13 +48,30 @@ 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 ovsdb/dot2pic \
+                                vswitchd/vswitch.ovsschema
+	$(OVSDB_DOT) $(srcdir)/vswitchd/vswitch.ovsschema \
+		| dot -T plain \
+		| $(srcdir)/ovsdb/dot2pic \
+		> $@.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
+	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 $@