X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=592be607a7a782fa1f24a70d03395274ed0e5e0d;hb=933df876ffa272d9d5768edf7fc5465261888ad2;hp=2cff64bc05e0bafe0d624a6844d8538865ff0ad8;hpb=8936565369410daa099708be4cd3fa7e0e39bade;p=sliver-openvswitch.git diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index 2cff64bc0..592be607a 100644 --- 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 @@ -21,17 +21,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 += \ @@ -44,13 +46,31 @@ 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 + 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 $@