X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=c5bf98f5d57dc0f9462becc8e2f02cbb00113b91;hb=6c4bf0b0070d474ac6cf97b3fda2e262cd060703;hp=2c57da02aac47b0a2c4ded9d875edf9ac8865927;hpb=7634353824f1631c3008dc43a4a1cc0aebff3caa;p=openvswitch

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 2c57da02..c5bf98f5 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -6,8 +6,7 @@ bin_PROGRAMS += \
 	utilities/ovs-kill \
 	utilities/ovs-ofctl \
 	utilities/ovs-openflowd \
-	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 
@@ -24,8 +23,7 @@ EXTRA_DIST += \
 	utilities/ovs-pki-cgi.in \
 	utilities/ovs-pki.8.in \
 	utilities/ovs-pki.in \
-	utilities/ovs-vsctl.8.in \
-	utilities/ovs-vsctl.in
+	utilities/ovs-vsctl.8.in
 DISTCLEANFILES += \
 	utilities/ovs-appctl.8 \
 	utilities/ovs-controller.8 \
@@ -38,7 +36,6 @@ DISTCLEANFILES += \
 	utilities/ovs-pki \
 	utilities/ovs-pki-cgi \
 	utilities/ovs-pki.8 \
-	utilities/ovs-vsctl \
 	utilities/ovs-vsctl.8
 
 man_MANS += \
@@ -56,28 +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 $(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