X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=69cc5d2484cd3bcd18877f1c0be7451c6646d264;hb=870b54e7c7ce23660e6db4999e58d9e6ac2ea618;hp=b267c02f1d7ecab12dc1d20d37d956bb53969321;hpb=431488e6638d3fbb53d215fa10d2ff2d8f1c2824;p=sliver-openvswitch.git

diff --git a/utilities/automake.mk b/utilities/automake.mk
index b267c02f1..69cc5d248 100644
--- 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
@@ -14,14 +12,15 @@ bin_SCRIPTS += \
 	utilities/ovs-vlan-test
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
+scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
 
 EXTRA_DIST += \
 	utilities/ovs-appctl.8.in \
 	utilities/ovs-controller.8.in \
-	utilities/ovs-discover.8.in \
+	utilities/ovs-ctl.in \
 	utilities/ovs-dpctl.8.in \
+	utilities/ovs-lib.sh.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 \
@@ -39,11 +38,11 @@ EXTRA_DIST += \
 	utilities/ovs-vsctl.8.in
 DISTCLEANFILES += \
 	utilities/ovs-appctl.8 \
+	utilities/ovs-ctl \
 	utilities/ovs-controller.8 \
-	utilities/ovs-discover.8 \
 	utilities/ovs-dpctl.8 \
+	utilities/ovs-lib.sh \
 	utilities/ovs-ofctl.8 \
-	utilities/ovs-openflowd.8 \
 	utilities/ovs-parse-leaks \
 	utilities/ovs-pcap \
 	utilities/ovs-pcap.1 \
@@ -54,22 +53,22 @@ 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
+dist_man_MANS += utilities/ovs-ctl.8
 
 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
 utilities_ovs_appctl_LDADD = lib/libopenvswitch.a
@@ -77,19 +76,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)