X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=2cff64bc05e0bafe0d624a6844d8538865ff0ad8;hb=26efd2563bf76547cf38da49ec83997e091b2517;hp=6860488f63f57b19786ae245e002bbc4ffd90424;hpb=d879a707a38eff0335e1b5c12ae4c61f4aa0296b;p=openvswitch

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 6860488f..2cff64bc 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -1,47 +1,56 @@
 sbin_PROGRAMS += vswitchd/ovs-vswitchd vswitchd/ovs-brcompatd
 man_MANS += \
-	vswitchd/ovs-vswitchd.conf.5 \
 	vswitchd/ovs-vswitchd.8 \
 	vswitchd/ovs-brcompatd.8
 DISTCLEANFILES += \
-	vswitchd/ovs-vswitchd.conf.5 \
 	vswitchd/ovs-vswitchd.8 \
 	vswitchd/ovs-brcompatd.8
 
 vswitchd_ovs_vswitchd_SOURCES = \
 	vswitchd/bridge.c \
 	vswitchd/bridge.h \
-	vswitchd/mgmt.c \
-	vswitchd/mgmt.h \
 	vswitchd/proc-net-compat.c \
 	vswitchd/proc-net-compat.h \
 	vswitchd/ovs-vswitchd.c \
-	vswitchd/ovs-vswitchd.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 \
-	$(FAULT_LIBS) \
 	$(SSL_LIBS)
 
 vswitchd_ovs_brcompatd_SOURCES = \
-	vswitchd/ovs-brcompatd.c
+	vswitchd/ovs-brcompatd.c \
+	vswitchd/vswitch-idl.c \
+	vswitchd/vswitch-idl.h
 
-vswitchd_ovs_brcompatd_LDADD = \
-	lib/libopenvswitch.a \
-	$(FAULT_LIBS) 
+vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 EXTRA_DIST += \
-	vswitchd/ovs-vswitchd.conf.5.in \
 	vswitchd/ovs-vswitchd.8.in \
 	vswitchd/ovs-brcompatd.8.in
 
-EXTRA_DIST += vswitchd/vswitch.ovsidl
-BUILT_SOURCES += vswitchd/vswitch-idl.h
-DISTCLEANFILES += \
-	vswitchd/vswitch.ovsidl \
-	vswitchd/vswitch-idl.h
-vswitchd/vswitch-idl.h: vswitchd/vswitch.ovsidl ovsdb/ovsdb-idlc
-	ovsdb/ovsdb-idlc c-idl-header $(srcdir)/vswitchd/vswitch.ovsidl > $@
+# 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)
+vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
+	$(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+	mv $@.tmp $@
+
+# 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_DOC) \
+		--title="ovs-vswitchd.conf.db" \
+		$(srcdir)/vswitchd/vswitch.ovsschema \
+		$(srcdir)/vswitchd/vswitch.xml > $@.tmp
+	mv $@.tmp $@