X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=2cff64bc05e0bafe0d624a6844d8538865ff0ad8;hb=32ae20b88e80c0a0fec574e429ddf43f359c6e39;hp=9121169afec5309e855d0a0cc3604afc4f97a128;hpb=00732bf5b5da6f1d71dc4f4b42f54224c03f71f6;p=openvswitch diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index 9121169a..2cff64bc 100644 --- a/vswitchd/automake.mk +++ b/vswitchd/automake.mk @@ -18,6 +18,7 @@ vswitchd_ovs_vswitchd_SOURCES = \ vswitchd/xenserver.h vswitchd_ovs_vswitchd_LDADD = \ ofproto/libofproto.a \ + lib/libsflow.a \ lib/libopenvswitch.a \ $(SSL_LIBS) @@ -32,15 +33,24 @@ EXTRA_DIST += \ vswitchd/ovs-vswitchd.8.in \ vswitchd/ovs-brcompatd.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 -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 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 $@