X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=9f2bb6347d38ef8ebc204b8e9a92c1d6ddbdbc51;hb=14002a5984e97f0f2482acdbb445c45266e2c6a1;hp=04a7fdccac7c64c6819fc218f5d2e6dce6b075c5;hpb=2d8bdd8f220848611722bce97b3258600530e95e;p=sliver-openvswitch.git

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 04a7fdcca..9f2bb6347 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -4,16 +4,16 @@ bin_PROGRAMS += \
 	utilities/ovs-dpctl \
 	utilities/ovs-ofctl \
 	utilities/ovs-vsctl
-bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl utilities/ovs-parse-leaks
+bin_SCRIPTS += utilities/ovs-pki
 if HAVE_PYTHON
 bin_SCRIPTS += \
 	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,11 @@ scripts_DATA += utilities/ovs-lib
 EXTRA_DIST += \
 	utilities/ovs-check-dead-ifs.in \
 	utilities/ovs-ctl.in \
+	utilities/ovs-dev.py \
 	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 \
@@ -41,7 +41,7 @@ MAN_ROOTS += \
 	utilities/ovs-dpctl.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 \
@@ -61,11 +61,10 @@ DISTCLEANFILES += \
 	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 \
@@ -83,7 +82,7 @@ man_MANS += \
 	utilities/ovs-dpctl.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 \
@@ -111,7 +110,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)