projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Fix --with-linux when environment contains KSRC.
[openvswitch]
/
utilities
/
automake.mk
diff --git
a/utilities/automake.mk
b/utilities/automake.mk
index 36b2b91b08b6bf98669964c79d8e6833ec2d663c..69cc5d2484cd3bcd18877f1c0be7451c6646d264 100644
(file)
--- a/
utilities/automake.mk
+++ b/
utilities/automake.mk
@@
-1,11
+1,8
@@
bin_PROGRAMS += \
utilities/ovs-appctl \
utilities/ovs-controller \
bin_PROGRAMS += \
utilities/ovs-appctl \
utilities/ovs-controller \
- utilities/ovs-discover \
utilities/ovs-dpctl \
utilities/ovs-dpctl \
- utilities/ovs-kill \
utilities/ovs-ofctl \
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
@@
-15,15
+12,15
@@
bin_SCRIPTS += \
utilities/ovs-vlan-test
endif
noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
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
EXTRA_DIST += \
utilities/ovs-appctl.8.in \
utilities/ovs-controller.8.in \
EXTRA_DIST += \
utilities/ovs-appctl.8.in \
utilities/ovs-controller.8.in \
- utilities/ovs-
discover.8
.in \
+ utilities/ovs-
ctl
.in \
utilities/ovs-dpctl.8.in \
utilities/ovs-dpctl.8.in \
- utilities/ovs-
kill.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 \
@@
-34,17
+31,18
@@
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-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-vlan-test.8.in \
utilities/ovs-vsctl.8.in
DISTCLEANFILES += \
utilities/ovs-appctl.8 \
+ utilities/ovs-ctl \
utilities/ovs-controller.8 \
utilities/ovs-controller.8 \
- utilities/ovs-discover.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-dpctl.8 \
- utilities/ovs-
kill.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 \
@@
-55,22
+53,22
@@
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-appctl.8 \
utilities/ovs-controller.8 \
utilities/ovs-vsctl.8
man_MANS += \
utilities/ovs-appctl.8 \
utilities/ovs-controller.8 \
- utilities/ovs-discover.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-dpctl.8 \
- utilities/ovs-kill.8 \
utilities/ovs-ofctl.8 \
utilities/ovs-ofctl.8 \
- utilities/ovs-openflowd.8 \
utilities/ovs-parse-leaks.8 \
utilities/ovs-pcap.1 \
utilities/ovs-pki.8 \
utilities/ovs-tcpundump.1 \
utilities/ovs-parse-leaks.8 \
utilities/ovs-pcap.1 \
utilities/ovs-pki.8 \
utilities/ovs-tcpundump.1 \
+ utilities/ovs-vlan-bug-workaround.8 \
utilities/ovs-vlan-test.8 \
utilities/ovs-vsctl.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
@@
-78,22
+76,12
@@
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_controller_SOURCES = utilities/ovs-controller.c
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
utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
-utilities_ovs_kill_SOURCES = utilities/ovs-kill.c
-utilities_ovs_kill_LDADD = lib/libopenvswitch.a
-
utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
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)
@@
-101,6
+89,10
@@
utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
if HAVE_NETLINK
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
noinst_PROGRAMS += utilities/nlmon
utilities_nlmon_SOURCES = utilities/nlmon.c
utilities_nlmon_LDADD = lib/libopenvswitch.a