X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=3e38e3742fc9e58c3c97840f9364621278192555;hb=c260f4e2e01fa5e6d2dbfbfed5314cccbae6bc8d;hp=520c37310c2da95c34b910f0f0e9ed0f819cf1a5;hpb=b2df0225a3575e2a15cdf67adc4b2dd9656fed19;p=sliver-openvswitch.git

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 520c37310..3e38e3742 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -1,56 +1,79 @@
 bin_PROGRAMS += \
 	utilities/ovs-appctl \
-	utilities/ovs-controller \
 	utilities/ovs-dpctl \
 	utilities/ovs-ofctl \
 	utilities/ovs-vsctl
-bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
+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 utilities/ovs-parse-leaks
-scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
+scripts_SCRIPTS += \
+	utilities/ovs-check-dead-ifs \
+	utilities/ovs-ctl \
+	utilities/ovs-save
+scripts_DATA += utilities/ovs-lib
+
+utilities/ovs-lib: $(top_builddir)/config.status
 
 EXTRA_DIST += \
-	utilities/ovs-appctl.8.in \
-	utilities/ovs-controller.8.in \
+	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-backtrace.in \
+	utilities/ovs-pcap.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-benchmark.1.in \
+	utilities/ovs-ctl.8 \
 	utilities/ovs-dpctl.8.in \
-	utilities/ovs-lib.sh.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-leaks.in \
+	utilities/ovs-parse-backtrace.8 \
 	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-controller.8 \
+	utilities/ovs-benchmark.1 \
+	utilities/ovs-check-dead-ifs \
 	utilities/ovs-dpctl.8 \
-	utilities/ovs-lib.sh \
+	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 \
+	utilities/ovs-test \
+	utilities/ovs-test.8 \
 	utilities/ovs-vlan-test \
 	utilities/ovs-vlan-test.8 \
 	utilities/ovs-vlan-bug-workaround.8 \
@@ -58,44 +81,47 @@ DISTCLEANFILES += \
 
 man_MANS += \
 	utilities/ovs-appctl.8 \
-	utilities/ovs-controller.8 \
+	utilities/ovs-benchmark.1 \
+	utilities/ovs-ctl.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 \
 	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_controller_SOURCES = utilities/ovs-controller.c
-utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+utilities_ovs_appctl_LDADD = lib/libopenvswitch.la
 
 utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
-utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
+utilities_ovs_dpctl_LDADD = lib/libopenvswitch.la
 
 utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
 utilities_ovs_ofctl_LDADD = \
-	ofproto/libofproto.a \
-	lib/libopenvswitch.a \
-	$(SSL_LIBS)
+	ofproto/libofproto.la \
+	lib/libopenvswitch.la
 
-utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
-utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c
+utilities_ovs_vsctl_LDADD = lib/libopenvswitch.la
 
-if HAVE_NETLINK
+if LINUX
 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.la
 
 noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
-utilities_nlmon_LDADD = lib/libopenvswitch.a
+utilities_nlmon_LDADD = lib/libopenvswitch.la
 endif
 
+bin_PROGRAMS += utilities/ovs-benchmark
+utilities_ovs_benchmark_SOURCES = utilities/ovs-benchmark.c
+utilities_ovs_benchmark_LDADD = lib/libopenvswitch.la
+
 include utilities/bugtool/automake.mk