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

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 5bf3cbb7e..b267c02f1 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -1,85 +1,107 @@
 bin_PROGRAMS += \
 	utilities/ovs-appctl \
-	utilities/ovs-cfg-mod \
 	utilities/ovs-controller \
 	utilities/ovs-discover \
 	utilities/ovs-dpctl \
-	utilities/ovs-kill \
 	utilities/ovs-ofctl \
 	utilities/ovs-openflowd \
-	utilities/ovs-wdt
-noinst_PROGRAMS += utilities/nlmon
-bin_SCRIPTS += utilities/ovs-pki
+	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 \
-	utilities/ovs-cfg-mod.8.in \
 	utilities/ovs-controller.8.in \
 	utilities/ovs-discover.8.in \
 	utilities/ovs-dpctl.8.in \
-	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-pki.in \
+	utilities/ovs-save \
+	utilities/ovs-tcpundump.1.in \
+	utilities/ovs-tcpundump.in \
+	utilities/ovs-vlan-bugs.man \
+	utilities/ovs-vlan-test.in \
+	utilities/ovs-vlan-bug-workaround.8.in \
+	utilities/ovs-vlan-test.8.in \
+	utilities/ovs-vsctl.8.in
 DISTCLEANFILES += \
 	utilities/ovs-appctl.8 \
-	utilities/ovs-cfg-mod.8 \
 	utilities/ovs-controller.8 \
 	utilities/ovs-discover.8 \
 	utilities/ovs-dpctl.8 \
-	utilities/ovs-kill.8 \
 	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-pki-cgi
+	utilities/ovs-tcpundump \
+	utilities/ovs-tcpundump.1 \
+	utilities/ovs-vlan-test \
+	utilities/ovs-vlan-test.8 \
+	utilities/ovs-vsctl.8
 
 man_MANS += \
 	utilities/ovs-appctl.8 \
-	utilities/ovs-cfg-mod.8 \
 	utilities/ovs-controller.8 \
 	utilities/ovs-discover.8 \
 	utilities/ovs-dpctl.8 \
-	utilities/ovs-kill.8 \
 	utilities/ovs-ofctl.8 \
 	utilities/ovs-openflowd.8 \
-	utilities/ovs-pki.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-test.8 \
+	utilities/ovs-vsctl.8
 
 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
 utilities_ovs_appctl_LDADD = lib/libopenvswitch.a
 
-utilities_ovs_cfg_mod_SOURCES = utilities/ovs-cfg-mod.c
-utilities_ovs_cfg_mod_LDADD = lib/libopenvswitch.a
-
 utilities_ovs_controller_SOURCES = utilities/ovs-controller.c
-utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS)
+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 $(FAULT_LIBS)
-
-utilities_ovs_kill_SOURCES = utilities/ovs-kill.c
-utilities_ovs_kill_LDADD = lib/libopenvswitch.a
+utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
 
 utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
-utilities_ovs_ofctl_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS)
+utilities_ovs_ofctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 utilities_ovs_openflowd_SOURCES = utilities/ovs-openflowd.c
 utilities_ovs_openflowd_LDADD = \
 	ofproto/libofproto.a \
+	lib/libsflow.a \
 	lib/libopenvswitch.a \
-	$(FAULT_LIBS) \
 	$(SSL_LIBS)
 
-utilities_ovs_wdt_SOURCES = utilities/ovs-wdt.c
+utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
+utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+
+if HAVE_NETLINK
+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
 
+noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
 utilities_nlmon_LDADD = lib/libopenvswitch.a
+endif