Support vlan_group workaround implemented in XenServer kernels.

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

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 9a334e3..b267c02 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -3,13 +3,15 @@ bin_PROGRAMS += \
        utilities/ovs-controller \
        utilities/ovs-discover \
        utilities/ovs-dpctl \
-       utilities/ovs-kill \
        utilities/ovs-ofctl \
        utilities/ovs-openflowd \
        utilities/ovs-vsctl
 bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
 if HAVE_PYTHON
-bin_SCRIPTS += utilities/ovs-pcap utilities/ovs-tcpundump
+bin_SCRIPTS += \
+       utilities/ovs-pcap \
+       utilities/ovs-tcpundump \
+       utilities/ovs-vlan-test
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
 
@@ -18,7 +20,6 @@ EXTRA_DIST += \
        utilities/ovs-controller.8.in \
        utilities/ovs-discover.8.in \
        utilities/ovs-dpctl.8.in \
-       utilities/ovs-kill.8.in \
        utilities/ovs-ofctl.8.in \
        utilities/ovs-openflowd.8.in \
        utilities/ovs-parse-leaks.8 \
@@ -28,15 +29,19 @@ EXTRA_DIST += \
        utilities/ovs-pki-cgi.in \
        utilities/ovs-pki.8.in \
        utilities/ovs-pki.in \
+       utilities/ovs-save \
        utilities/ovs-tcpundump.1.in \
        utilities/ovs-tcpundump.in \
+       utilities/ovs-vlan-bugs.man \
+       utilities/ovs-vlan-test.in \
+       utilities/ovs-vlan-bug-workaround.8.in \
+       utilities/ovs-vlan-test.8.in \
        utilities/ovs-vsctl.8.in
 DISTCLEANFILES += \
        utilities/ovs-appctl.8 \
        utilities/ovs-controller.8 \
        utilities/ovs-discover.8 \
        utilities/ovs-dpctl.8 \
-       utilities/ovs-kill.8 \
        utilities/ovs-ofctl.8 \
        utilities/ovs-openflowd.8 \
        utilities/ovs-parse-leaks \
@@ -47,6 +52,8 @@ DISTCLEANFILES += \
        utilities/ovs-pki.8 \
        utilities/ovs-tcpundump \
        utilities/ovs-tcpundump.1 \
+       utilities/ovs-vlan-test \
+       utilities/ovs-vlan-test.8 \
        utilities/ovs-vsctl.8
 
 man_MANS += \
@@ -54,13 +61,14 @@ man_MANS += \
        utilities/ovs-controller.8 \
        utilities/ovs-discover.8 \
        utilities/ovs-dpctl.8 \
-       utilities/ovs-kill.8 \
        utilities/ovs-ofctl.8 \
        utilities/ovs-openflowd.8 \
        utilities/ovs-parse-leaks.8 \
        utilities/ovs-pcap.1 \
        utilities/ovs-pki.8 \
        utilities/ovs-tcpundump.1 \
+       utilities/ovs-vlan-bug-workaround.8.in \
+       utilities/ovs-vlan-test.8 \
        utilities/ovs-vsctl.8
 
 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
@@ -75,9 +83,6 @@ utilities_ovs_discover_LDADD = lib/libopenvswitch.a
 utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
 utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
 
-utilities_ovs_kill_SOURCES = utilities/ovs-kill.c
-utilities_ovs_kill_LDADD = lib/libopenvswitch.a
-
 utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
 utilities_ovs_ofctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
@@ -92,6 +97,10 @@ utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
 utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 if HAVE_NETLINK
+sbin_PROGRAMS += utilities/ovs-vlan-bug-workaround
+utilities_ovs_vlan_bug_workaround_SOURCES = utilities/ovs-vlan-bug-workaround.c
+utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.a
+
 noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
 utilities_nlmon_LDADD = lib/libopenvswitch.a