X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=d26f961d1a81fad495b1ea84d33632acc7549048;hb=1d5aaa61fa8ca68f487e8b578b7aa99a0bbd1f26;hp=7bb2c6d61cfee1e3070b822f5b951b86267be713;hpb=ae755ca7e1efc425862d7ce51ac12ac0b2df677a;p=sliver-openvswitch.git

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 7bb2c6d61..d26f961d1 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -1,19 +1,19 @@
 bin_PROGRAMS += \
 	utilities/ovs-appctl \
-	utilities/ovs-controller \
 	utilities/ovs-dpctl \
 	utilities/ovs-ofctl \
 	utilities/ovs-vsctl
-bin_SCRIPTS += utilities/ovs-pki utilities/ovs-parse-leaks
+bin_SCRIPTS += utilities/ovs-pki
 if HAVE_PYTHON
 bin_SCRIPTS += \
+	utilities/ovs-dpctl-top \
 	utilities/ovs-l3ping \
+	utilities/ovs-parse-backtrace \
 	utilities/ovs-pcap \
 	utilities/ovs-tcpundump \
 	utilities/ovs-test \
 	utilities/ovs-vlan-test
 endif
-noinst_SCRIPTS += utilities/ovs-pki-cgi
 scripts_SCRIPTS += \
 	utilities/ovs-check-dead-ifs \
 	utilities/ovs-ctl \
@@ -23,11 +23,12 @@ scripts_DATA += utilities/ovs-lib
 EXTRA_DIST += \
 	utilities/ovs-check-dead-ifs.in \
 	utilities/ovs-ctl.in \
+	utilities/ovs-dev.py \
+	utilities/ovs-dpctl-top.in \
 	utilities/ovs-l3ping.in \
 	utilities/ovs-lib.in \
-	utilities/ovs-parse-leaks.in \
+	utilities/ovs-parse-backtrace.in \
 	utilities/ovs-pcap.in \
-	utilities/ovs-pki-cgi.in \
 	utilities/ovs-pki.in \
 	utilities/ovs-save \
 	utilities/ovs-tcpundump.in \
@@ -36,12 +37,12 @@ EXTRA_DIST += \
 MAN_ROOTS += \
 	utilities/ovs-appctl.8.in \
 	utilities/ovs-benchmark.1.in \
-	utilities/ovs-controller.8.in \
 	utilities/ovs-ctl.8 \
 	utilities/ovs-dpctl.8.in \
+	utilities/ovs-dpctl-top.8.in \
 	utilities/ovs-l3ping.8.in \
 	utilities/ovs-ofctl.8.in \
-	utilities/ovs-parse-leaks.8 \
+	utilities/ovs-parse-backtrace.8 \
 	utilities/ovs-pcap.1.in \
 	utilities/ovs-pki.8.in \
 	utilities/ovs-tcpundump.1.in \
@@ -55,17 +56,17 @@ DISTCLEANFILES += \
 	utilities/ovs-ctl \
 	utilities/ovs-benchmark.1 \
 	utilities/ovs-check-dead-ifs \
-	utilities/ovs-controller.8 \
 	utilities/ovs-dpctl.8 \
+	utilities/ovs-dpctl-top \
+	utilities/ovs-dpctl-top.8 \
 	utilities/ovs-l3ping \
 	utilities/ovs-l3ping.8 \
 	utilities/ovs-lib \
 	utilities/ovs-ofctl.8 \
-	utilities/ovs-parse-leaks \
+	utilities/ovs-parse-backtrace \
 	utilities/ovs-pcap \
 	utilities/ovs-pcap.1 \
 	utilities/ovs-pki \
-	utilities/ovs-pki-cgi \
 	utilities/ovs-pki.8 \
 	utilities/ovs-tcpundump \
 	utilities/ovs-tcpundump.1 \
@@ -79,11 +80,11 @@ DISTCLEANFILES += \
 man_MANS += \
 	utilities/ovs-appctl.8 \
 	utilities/ovs-benchmark.1 \
-	utilities/ovs-controller.8 \
 	utilities/ovs-dpctl.8 \
+	utilities/ovs-dpctl-top.8 \
 	utilities/ovs-l3ping.8 \
 	utilities/ovs-ofctl.8 \
-	utilities/ovs-parse-leaks.8 \
+	utilities/ovs-parse-backtrace.8 \
 	utilities/ovs-pcap.1 \
 	utilities/ovs-pki.8 \
 	utilities/ovs-tcpundump.1 \
@@ -96,9 +97,6 @@ dist_man_MANS += utilities/ovs-ctl.8
 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
 utilities_ovs_appctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
-utilities_ovs_controller_SOURCES = utilities/ovs-controller.c
-utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-
 utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
 utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
@@ -111,7 +109,7 @@ utilities_ovs_ofctl_LDADD = \
 utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c
 utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
-if HAVE_NETLINK
+if LINUX_DATAPATH
 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 $(SSL_LIBS)