X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=36b2b91b08b6bf98669964c79d8e6833ec2d663c;hb=f7a122fc2457f805fd0906f4368ea42d2ea55584;hp=b84923135aa9cb1bd33e6a66eb103c40b02938b7;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=openvswitch

diff --git a/utilities/automake.mk b/utilities/automake.mk
index b8492313..36b2b91b 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -6,12 +6,15 @@ bin_PROGRAMS += \
 	utilities/ovs-kill \
 	utilities/ovs-ofctl \
 	utilities/ovs-openflowd \
-	utilities/ovs-vsctl \
-	utilities/ovs-wdt
-noinst_PROGRAMS += utilities/nlmon
+	utilities/ovs-vsctl
 bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
+if HAVE_PYTHON
+bin_SCRIPTS += \
+	utilities/ovs-pcap \
+	utilities/ovs-tcpundump \
+	utilities/ovs-vlan-test
+endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
-dist_sbin_SCRIPTS += utilities/ovs-monitor 
 
 EXTRA_DIST += \
 	utilities/ovs-appctl.8.in \
@@ -21,10 +24,18 @@ EXTRA_DIST += \
 	utilities/ovs-kill.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 \
+	utilities/ovs-pcap.in \
 	utilities/ovs-pki-cgi.in \
 	utilities/ovs-pki.8.in \
 	utilities/ovs-pki.in \
+	utilities/ovs-save \
+	utilities/ovs-tcpundump.1.in \
+	utilities/ovs-tcpundump.in \
+	utilities/ovs-vlan-test.in \
+	utilities/ovs-vlan-test.8.in \
 	utilities/ovs-vsctl.8.in
 DISTCLEANFILES += \
 	utilities/ovs-appctl.8 \
@@ -35,9 +46,15 @@ DISTCLEANFILES += \
 	utilities/ovs-ofctl.8 \
 	utilities/ovs-openflowd.8 \
 	utilities/ovs-parse-leaks \
+	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 \
+	utilities/ovs-vlan-test \
+	utilities/ovs-vlan-test.8 \
 	utilities/ovs-vsctl.8
 
 man_MANS += \
@@ -48,7 +65,11 @@ man_MANS += \
 	utilities/ovs-kill.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-test.8 \
 	utilities/ovs-vsctl.8
 
 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
@@ -77,9 +98,10 @@ utilities_ovs_openflowd_LDADD = \
 	$(SSL_LIBS)
 
 utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
-utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS) $(PCRE_LIBS)
-
-utilities_ovs_wdt_SOURCES = utilities/ovs-wdt.c
+utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
+if HAVE_NETLINK
+noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
 utilities_nlmon_LDADD = lib/libopenvswitch.a
+endif