Fix race condition in parallel execution of "make install".

[openvswitch] / utilities / automake.mk

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 1c8a56b9eaf3f55a8de737d1335200248fe925d8..7bb2c6d61cfee1e3070b822f5b951b86267be713 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -4,21 +4,27 @@ bin_PROGRAMS += \
        utilities/ovs-dpctl \
        utilities/ovs-ofctl \
        utilities/ovs-vsctl
-bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl utilities/ovs-parse-leaks
+bin_SCRIPTS += utilities/ovs-pki utilities/ovs-parse-leaks
 if HAVE_PYTHON
 bin_SCRIPTS += \
+       utilities/ovs-l3ping \
        utilities/ovs-pcap \
        utilities/ovs-tcpundump \
        utilities/ovs-test \
        utilities/ovs-vlan-test
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi
-scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-save
-scripts_DATA += utilities/ovs-lib.sh
+scripts_SCRIPTS += \
+       utilities/ovs-check-dead-ifs \
+       utilities/ovs-ctl \
+       utilities/ovs-save
+scripts_DATA += utilities/ovs-lib
 
 EXTRA_DIST += \
+       utilities/ovs-check-dead-ifs.in \
        utilities/ovs-ctl.in \
-       utilities/ovs-lib.sh.in \
+       utilities/ovs-l3ping.in \
+       utilities/ovs-lib.in \
        utilities/ovs-parse-leaks.in \
        utilities/ovs-pcap.in \
        utilities/ovs-pki-cgi.in \
@@ -33,6 +39,7 @@ MAN_ROOTS += \
        utilities/ovs-controller.8.in \
        utilities/ovs-ctl.8 \
        utilities/ovs-dpctl.8.in \
+       utilities/ovs-l3ping.8.in \
        utilities/ovs-ofctl.8.in \
        utilities/ovs-parse-leaks.8 \
        utilities/ovs-pcap.1.in \
@@ -47,9 +54,12 @@ DISTCLEANFILES += \
        utilities/ovs-appctl.8 \
        utilities/ovs-ctl \
        utilities/ovs-benchmark.1 \
+       utilities/ovs-check-dead-ifs \
        utilities/ovs-controller.8 \
        utilities/ovs-dpctl.8 \
-       utilities/ovs-lib.sh \
+       utilities/ovs-l3ping \
+       utilities/ovs-l3ping.8 \
+       utilities/ovs-lib \
        utilities/ovs-ofctl.8 \
        utilities/ovs-parse-leaks \
        utilities/ovs-pcap \
@@ -71,6 +81,7 @@ man_MANS += \
        utilities/ovs-benchmark.1 \
        utilities/ovs-controller.8 \
        utilities/ovs-dpctl.8 \
+       utilities/ovs-l3ping.8 \
        utilities/ovs-ofctl.8 \
        utilities/ovs-parse-leaks.8 \
        utilities/ovs-pcap.1 \
@@ -83,13 +94,13 @@ man_MANS += \
 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_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_dpctl_SOURCES = utilities/ovs-dpctl.c
-utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a
+utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c
 utilities_ovs_ofctl_LDADD = \
@@ -97,21 +108,21 @@ utilities_ovs_ofctl_LDADD = \
        lib/libopenvswitch.a \
        $(SSL_LIBS)
 
-utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
+utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c
 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
+utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 noinst_PROGRAMS += utilities/nlmon
 utilities_nlmon_SOURCES = utilities/nlmon.c
-utilities_nlmon_LDADD = lib/libopenvswitch.a
+utilities_nlmon_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 endif
 
 bin_PROGRAMS += utilities/ovs-benchmark
 utilities_ovs_benchmark_SOURCES = utilities/ovs-benchmark.c
-utilities_ovs_benchmark_LDADD = lib/libopenvswitch.a
+utilities_ovs_benchmark_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 include utilities/bugtool/automake.mk