X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=c5bf98f5d57dc0f9462becc8e2f02cbb00113b91;hb=3c34dd48afdb134f74099c5b84fe5bdc33656023;hp=aec78b5311336552b19588c3eaaea75400dbd6df;hpb=c75d15113c56e30ea5a1ace777cd3105c7b750d3;p=openvswitch diff --git a/utilities/automake.mk b/utilities/automake.mk index aec78b53..c5bf98f5 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -6,9 +6,7 @@ bin_PROGRAMS += \ utilities/ovs-kill \ utilities/ovs-ofctl \ utilities/ovs-openflowd \ - utilities/ovs-vsctl \ - utilities/ovs-wdt -noinst_PROGRAMS += utilities/nlmon + utilities/ovs-vsctl bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks dist_sbin_SCRIPTS += utilities/ovs-monitor @@ -55,31 +53,35 @@ utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c utilities_ovs_appctl_LDADD = lib/libopenvswitch.a utilities_ovs_controller_SOURCES = utilities/ovs-controller.c -utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS) +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 $(FAULT_LIBS) +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_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS) +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 \ - $(FAULT_LIBS) \ $(SSL_LIBS) utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c -utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) +utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +if HAVE_NETLINK +bin_PROGRAMS += utilities/ovs-wdt utilities_ovs_wdt_SOURCES = utilities/ovs-wdt.c +noinst_PROGRAMS += utilities/nlmon utilities_nlmon_SOURCES = utilities/nlmon.c utilities_nlmon_LDADD = lib/libopenvswitch.a +endif