X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=9da7f8289594469094af0de99f93ee359c8d8ebc;hb=2dc7590de5e0adae1e332ff84c0c8af264f403b9;hp=8bea123e86bbe3a19f18a95857c35e2d63d17240;hpb=51a5f442e28be66777225bf0a90d5dd62b54cbf4;p=sliver-openvswitch.git

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 8bea123e8..9da7f8289 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -4,48 +4,56 @@ bin_PROGRAMS += \
 	utilities/ovs-dpctl \
 	utilities/ovs-ofctl \
 	utilities/ovs-vsctl
-bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
+bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl utilities/ovs-parse-leaks
 if HAVE_PYTHON
 bin_SCRIPTS += \
-	utilities/ovs-bugtool \
 	utilities/ovs-pcap \
 	utilities/ovs-tcpundump \
+	utilities/ovs-test \
 	utilities/ovs-vlan-test
-man_MANS += utilities/ovs-bugtool.8
 endif
-noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
-scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
+noinst_SCRIPTS += utilities/ovs-pki-cgi
+scripts_SCRIPTS += \
+	utilities/ovs-check-dead-ifs \
+	utilities/ovs-ctl \
+	utilities/ovs-save
+scripts_DATA += utilities/ovs-lib
 
 EXTRA_DIST += \
+	utilities/ovs-check-dead-ifs.in \
+	utilities/ovs-ctl.in \
+	utilities/ovs-lib.in \
+	utilities/ovs-parse-leaks.in \
+	utilities/ovs-pcap.in \
+	utilities/ovs-pki-cgi.in \
+	utilities/ovs-pki.in \
+	utilities/ovs-save \
+	utilities/ovs-tcpundump.in \
+	utilities/ovs-test.in \
+	utilities/ovs-vlan-test.in
+MAN_ROOTS += \
 	utilities/ovs-appctl.8.in \
-	utilities/ovs-bugtool \
-	utilities/ovs-bugtool.8 \
+	utilities/ovs-benchmark.1.in \
 	utilities/ovs-controller.8.in \
-	utilities/ovs-ctl.in \
+	utilities/ovs-ctl.8 \
 	utilities/ovs-dpctl.8.in \
-	utilities/ovs-lib.sh.in \
 	utilities/ovs-ofctl.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-bugs.man \
-	utilities/ovs-vlan-test.in \
 	utilities/ovs-vlan-bug-workaround.8.in \
+	utilities/ovs-test.8.in \
 	utilities/ovs-vlan-test.8.in \
 	utilities/ovs-vsctl.8.in
+MAN_FRAGMENTS += utilities/ovs-vlan-bugs.man
 DISTCLEANFILES += \
 	utilities/ovs-appctl.8 \
 	utilities/ovs-ctl \
+	utilities/ovs-benchmark.1 \
 	utilities/ovs-controller.8 \
 	utilities/ovs-dpctl.8 \
-	utilities/ovs-lib.sh \
+	utilities/ovs-lib \
 	utilities/ovs-ofctl.8 \
 	utilities/ovs-parse-leaks \
 	utilities/ovs-pcap \
@@ -55,6 +63,8 @@ DISTCLEANFILES += \
 	utilities/ovs-pki.8 \
 	utilities/ovs-tcpundump \
 	utilities/ovs-tcpundump.1 \
+	utilities/ovs-test \
+	utilities/ovs-test.8 \
 	utilities/ovs-vlan-test \
 	utilities/ovs-vlan-test.8 \
 	utilities/ovs-vlan-bug-workaround.8 \
@@ -62,6 +72,7 @@ DISTCLEANFILES += \
 
 man_MANS += \
 	utilities/ovs-appctl.8 \
+	utilities/ovs-benchmark.1 \
 	utilities/ovs-controller.8 \
 	utilities/ovs-dpctl.8 \
 	utilities/ovs-ofctl.8 \
@@ -70,18 +81,19 @@ man_MANS += \
 	utilities/ovs-pki.8 \
 	utilities/ovs-tcpundump.1 \
 	utilities/ovs-vlan-bug-workaround.8 \
+	utilities/ovs-test.8 \
 	utilities/ovs-vlan-test.8 \
 	utilities/ovs-vsctl.8
 dist_man_MANS += utilities/ovs-ctl.8
 
 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
-utilities_ovs_appctl_LDADD = lib/libopenvswitch.a
+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
+utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
 utilities_ovs_ofctl_LDADD = \
@@ -89,15 +101,21 @@ utilities_ovs_ofctl_LDADD = \
 	lib/libopenvswitch.a \
 	$(SSL_LIBS)
 
-utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
+utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.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
+utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
-utilities_nlmon_LDADD = lib/libopenvswitch.a
+utilities_nlmon_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 endif
+
+bin_PROGRAMS += utilities/ovs-benchmark
+utilities_ovs_benchmark_SOURCES = utilities/ovs-benchmark.c
+utilities_ovs_benchmark_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+
+include utilities/bugtool/automake.mk