utilities: Install ovs-parse-leaks utility by default.

[sliver-openvswitch.git] / utilities / automake.mk

diff --git a/utilities/automake.mk b/utilities/automake.mk
index cb06f5a..aab85a2 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -3,23 +3,24 @@ bin_PROGRAMS += \
        utilities/ovs-controller \
        utilities/ovs-dpctl \
        utilities/ovs-ofctl \
-       utilities/ovs-openflowd \
        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
-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 \
        utilities/ovs-controller.8.in \
+       utilities/ovs-ctl.in \
        utilities/ovs-dpctl.8.in \
+       utilities/ovs-lib.sh.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 \
@@ -37,10 +38,11 @@ EXTRA_DIST += \
        utilities/ovs-vsctl.8.in
 DISTCLEANFILES += \
        utilities/ovs-appctl.8 \
+       utilities/ovs-ctl \
        utilities/ovs-controller.8 \
        utilities/ovs-dpctl.8 \
+       utilities/ovs-lib.sh \
        utilities/ovs-ofctl.8 \
-       utilities/ovs-openflowd.8 \
        utilities/ovs-parse-leaks \
        utilities/ovs-pcap \
        utilities/ovs-pcap.1 \
@@ -59,7 +61,6 @@ man_MANS += \
        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 \
@@ -67,6 +68,7 @@ man_MANS += \
        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
@@ -83,13 +85,6 @@ utilities_ovs_ofctl_LDADD = \
        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)
 
@@ -102,3 +97,5 @@ noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
 utilities_nlmon_LDADD = lib/libopenvswitch.a
 endif
+
+include utilities/bugtool/automake.mk