X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=aec78b5311336552b19588c3eaaea75400dbd6df;hb=342045e17750e755558616f7fd826470e9b11a7e;hp=9ac12c92470344f983fe7acd1b75f909b737794b;hpb=3b135da329687c69d3a0f1689621f75cc4888d6f;p=openvswitch diff --git a/utilities/automake.mk b/utilities/automake.mk index 9ac12c92..aec78b53 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -1,12 +1,12 @@ bin_PROGRAMS += \ utilities/ovs-appctl \ - utilities/ovs-cfg-mod \ utilities/ovs-controller \ utilities/ovs-discover \ utilities/ovs-dpctl \ utilities/ovs-kill \ utilities/ovs-ofctl \ utilities/ovs-openflowd \ + utilities/ovs-vsctl \ utilities/ovs-wdt noinst_PROGRAMS += utilities/nlmon bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl @@ -15,7 +15,6 @@ dist_sbin_SCRIPTS += utilities/ovs-monitor EXTRA_DIST += \ utilities/ovs-appctl.8.in \ - utilities/ovs-cfg-mod.8.in \ utilities/ovs-controller.8.in \ utilities/ovs-discover.8.in \ utilities/ovs-dpctl.8.in \ @@ -26,11 +25,9 @@ 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-cfg-mod.8 \ utilities/ovs-controller.8 \ utilities/ovs-discover.8 \ utilities/ovs-dpctl.8 \ @@ -41,12 +38,10 @@ DISTCLEANFILES += \ utilities/ovs-pki \ utilities/ovs-pki-cgi \ utilities/ovs-pki.8 \ - utilities/ovs-vsctl \ utilities/ovs-vsctl.8 man_MANS += \ utilities/ovs-appctl.8 \ - utilities/ovs-cfg-mod.8 \ utilities/ovs-controller.8 \ utilities/ovs-discover.8 \ utilities/ovs-dpctl.8 \ @@ -59,9 +54,6 @@ man_MANS += \ utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c utilities_ovs_appctl_LDADD = lib/libopenvswitch.a -utilities_ovs_cfg_mod_SOURCES = utilities/ovs-cfg-mod.c -utilities_ovs_cfg_mod_LDADD = lib/libopenvswitch.a - utilities_ovs_controller_SOURCES = utilities/ovs-controller.c utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS) @@ -84,6 +76,9 @@ utilities_ovs_openflowd_LDADD = \ $(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_wdt_SOURCES = utilities/ovs-wdt.c utilities_nlmon_SOURCES = utilities/nlmon.c