projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process: Let process_run_capture() caller set maximum capture size.
[openvswitch]
/
utilities
/
automake.mk
diff --git
a/utilities/automake.mk
b/utilities/automake.mk
index 147e650eb4173be65401aad9fb714ef81d9cba97..47e3a1f772abfccdd2ca92b3fe4f00ff56d4e5e1 100644
(file)
--- a/
utilities/automake.mk
+++ b/
utilities/automake.mk
@@
-3,7
+3,6
@@
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
bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
if HAVE_PYTHON
utilities/ovs-vsctl
bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
if HAVE_PYTHON
@@
-19,7
+18,6
@@
EXTRA_DIST += \
utilities/ovs-controller.8.in \
utilities/ovs-dpctl.8.in \
utilities/ovs-ofctl.8.in \
utilities/ovs-controller.8.in \
utilities/ovs-dpctl.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 \
@@
-40,7
+38,6
@@
DISTCLEANFILES += \
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 \
utilities/ovs-pcap \
utilities/ovs-pcap.1 \
utilities/ovs-parse-leaks \
utilities/ovs-pcap \
utilities/ovs-pcap.1 \
@@
-51,6
+48,7
@@
DISTCLEANFILES += \
utilities/ovs-tcpundump.1 \
utilities/ovs-vlan-test \
utilities/ovs-vlan-test.8 \
utilities/ovs-tcpundump.1 \
utilities/ovs-vlan-test \
utilities/ovs-vlan-test.8 \
+ utilities/ovs-vlan-bug-workaround.8 \
utilities/ovs-vsctl.8
man_MANS += \
utilities/ovs-vsctl.8
man_MANS += \
@@
-58,7
+56,6
@@
man_MANS += \
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 \
@@
-77,12
+74,8
@@
utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
-utilities_ovs_ofctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-
-utilities_ovs_openflowd_SOURCES = utilities/ovs-openflowd.c
-utilities_ovs_openflowd_LDADD = \
+utilities_ovs_ofctl_LDADD = \
ofproto/libofproto.a \
ofproto/libofproto.a \
- lib/libsflow.a \
lib/libopenvswitch.a \
$(SSL_LIBS)
lib/libopenvswitch.a \
$(SSL_LIBS)