X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=47e3a1f772abfccdd2ca92b3fe4f00ff56d4e5e1;hb=4b3b481c9e8134b49dddba3ffbe1dd62f9ad16df;hp=1233762f2a38dd47e9aa040bc29d2ee87e2eb6cd;hpb=195c8086244e33ec42fd9fc8354eaedfd849bbba;p=sliver-openvswitch.git

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 1233762f2..47e3a1f77 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -3,7 +3,6 @@ bin_PROGRAMS += \
 	utilities/ovs-controller \
 	utilities/ovs-dpctl \
 	utilities/ovs-ofctl \
-	utilities/ovs-openflowd \
 	utilities/ovs-vsctl
 bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
 if HAVE_PYTHON
@@ -19,7 +18,6 @@ EXTRA_DIST += \
 	utilities/ovs-controller.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,7 +38,6 @@ DISTCLEANFILES += \
 	utilities/ovs-controller.8 \
 	utilities/ovs-dpctl.8 \
 	utilities/ovs-ofctl.8 \
-	utilities/ovs-openflowd.8 \
 	utilities/ovs-parse-leaks \
 	utilities/ovs-pcap \
 	utilities/ovs-pcap.1 \
@@ -51,6 +48,7 @@ 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 += \
@@ -58,12 +56,11 @@ man_MANS += \
 	utilities/ovs-controller.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,12 +74,8 @@ 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)