tests: Unit test autopath action parsing.

[openvswitch] / utilities / automake.mk

diff --git a/utilities/automake.mk b/utilities/automake.mk
index b267c02f1d7ecab12dc1d20d37d956bb53969321..47e3a1f772abfccdd2ca92b3fe4f00ff56d4e5e1 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -1,10 +1,8 @@
 bin_PROGRAMS += \
        utilities/ovs-appctl \
        utilities/ovs-controller \
-       utilities/ovs-discover \
        utilities/ovs-dpctl \
        utilities/ovs-ofctl \
-       utilities/ovs-openflowd \
        utilities/ovs-vsctl
 bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
 if HAVE_PYTHON
@@ -18,10 +16,8 @@ noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
 EXTRA_DIST += \
        utilities/ovs-appctl.8.in \
        utilities/ovs-controller.8.in \
-       utilities/ovs-discover.8.in \
        utilities/ovs-dpctl.8.in \
        utilities/ovs-ofctl.8.in \
-       utilities/ovs-openflowd.8.in \
        utilities/ovs-parse-leaks.8 \
        utilities/ovs-parse-leaks.in \
        utilities/ovs-pcap.1.in \
@@ -40,10 +36,8 @@ EXTRA_DIST += \
 DISTCLEANFILES += \
        utilities/ovs-appctl.8 \
        utilities/ovs-controller.8 \
-       utilities/ovs-discover.8 \
        utilities/ovs-dpctl.8 \
        utilities/ovs-ofctl.8 \
-       utilities/ovs-openflowd.8 \
        utilities/ovs-parse-leaks \
        utilities/ovs-pcap \
        utilities/ovs-pcap.1 \
@@ -54,20 +48,19 @@ DISTCLEANFILES += \
        utilities/ovs-tcpundump.1 \
        utilities/ovs-vlan-test \
        utilities/ovs-vlan-test.8 \
+       utilities/ovs-vlan-bug-workaround.8 \
        utilities/ovs-vsctl.8
 
 man_MANS += \
        utilities/ovs-appctl.8 \
        utilities/ovs-controller.8 \
-       utilities/ovs-discover.8 \
        utilities/ovs-dpctl.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-bug-workaround.8 \
        utilities/ovs-vlan-test.8 \
        utilities/ovs-vsctl.8
 
@@ -77,19 +70,12 @@ utilities_ovs_appctl_LDADD = lib/libopenvswitch.a
 utilities_ovs_controller_SOURCES = utilities/ovs-controller.c
 utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
-utilities_ovs_discover_SOURCES = utilities/ovs-discover.c
-utilities_ovs_discover_LDADD = lib/libopenvswitch.a
-
 utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
 utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
 
 utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
-utilities_ovs_ofctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-
-utilities_ovs_openflowd_SOURCES = utilities/ovs-openflowd.c
-utilities_ovs_openflowd_LDADD = \
+utilities_ovs_ofctl_LDADD = \
        ofproto/libofproto.a \
-       lib/libsflow.a \
        lib/libopenvswitch.a \
        $(SSL_LIBS)