projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs.daemon: Fix semantics of --pidfile option.
[openvswitch]
/
utilities
/
automake.mk
diff --git
a/utilities/automake.mk
b/utilities/automake.mk
index cb06f5a3e8523739422586a07a92e4bfd86bbb97..2cfdf8e33673fbdf4c9a19da2116aa9cd406a33b 100644
(file)
--- a/
utilities/automake.mk
+++ b/
utilities/automake.mk
@@
-3,23
+3,25
@@
bin_PROGRAMS += \
utilities/ovs-controller \
utilities/ovs-dpctl \
utilities/ovs-ofctl \
utilities/ovs-controller \
utilities/ovs-dpctl \
utilities/ovs-ofctl \
- utilities/ovs-openflowd \
utilities/ovs-vsctl
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-pcap \
utilities/ovs-tcpundump \
utilities/ovs-vlan-test
endif
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
+noinst_SCRIPTS += utilities/ovs-pki-cgi
+scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
EXTRA_DIST += \
utilities/ovs-appctl.8.in \
EXTRA_DIST += \
utilities/ovs-appctl.8.in \
+ utilities/ovs-benchmark.1.in \
utilities/ovs-controller.8.in \
utilities/ovs-controller.8.in \
+ utilities/ovs-ctl.in \
utilities/ovs-dpctl.8.in \
utilities/ovs-dpctl.8.in \
+ utilities/ovs-lib.sh.in \
utilities/ovs-ofctl.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-parse-leaks.8 \
utilities/ovs-parse-leaks.in \
utilities/ovs-pcap.1.in \
@@
-30,17
+32,19
@@
EXTRA_DIST += \
utilities/ovs-save \
utilities/ovs-tcpundump.1.in \
utilities/ovs-tcpundump.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
utilities/ovs-vlan-test.in \
utilities/ovs-vlan-bug-workaround.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 \
DISTCLEANFILES += \
utilities/ovs-appctl.8 \
+ utilities/ovs-ctl \
+ utilities/ovs-benchmark.1 \
utilities/ovs-controller.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-controller.8 \
utilities/ovs-dpctl.8 \
+ utilities/ovs-lib.sh \
utilities/ovs-ofctl.8 \
utilities/ovs-ofctl.8 \
- utilities/ovs-openflowd.8 \
utilities/ovs-parse-leaks \
utilities/ovs-pcap \
utilities/ovs-pcap.1 \
utilities/ovs-parse-leaks \
utilities/ovs-pcap \
utilities/ovs-pcap.1 \
@@
-56,10
+60,10
@@
DISTCLEANFILES += \
man_MANS += \
utilities/ovs-appctl.8 \
man_MANS += \
utilities/ovs-appctl.8 \
+ utilities/ovs-benchmark.1 \
utilities/ovs-controller.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-ofctl.8 \
utilities/ovs-controller.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-ofctl.8 \
- utilities/ovs-openflowd.8 \
utilities/ovs-parse-leaks.8 \
utilities/ovs-pcap.1 \
utilities/ovs-pki.8 \
utilities/ovs-parse-leaks.8 \
utilities/ovs-pcap.1 \
utilities/ovs-pki.8 \
@@
-67,6
+71,7
@@
man_MANS += \
utilities/ovs-vlan-bug-workaround.8 \
utilities/ovs-vlan-test.8 \
utilities/ovs-vsctl.8
utilities/ovs-vlan-bug-workaround.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_SOURCES = utilities/ovs-appctl.c
utilities_ovs_appctl_LDADD = lib/libopenvswitch.a
@@
-83,13
+88,6
@@
utilities_ovs_ofctl_LDADD = \
lib/libopenvswitch.a \
$(SSL_LIBS)
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 \
- $(SSL_LIBS)
-
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 vswitchd/vswitch-idl.c
utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
@@
-102,3
+100,9
@@
noinst_PROGRAMS += utilities/nlmon
utilities_nlmon_SOURCES = utilities/nlmon.c
utilities_nlmon_LDADD = lib/libopenvswitch.a
endif
utilities_nlmon_SOURCES = utilities/nlmon.c
utilities_nlmon_LDADD = lib/libopenvswitch.a
endif
+
+bin_PROGRAMS += utilities/ovs-benchmark
+utilities_ovs_benchmark_SOURCES = utilities/ovs-benchmark.c
+utilities_ovs_benchmark_LDADD = lib/libopenvswitch.a
+
+include utilities/bugtool/automake.mk