X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=ce1c8b23241326d11dd8752aff01256e83971bf5;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=9f2bb6347d38ef8ebc204b8e9a92c1d6ddbdbc51;hpb=fef5244f6f0ff04caa101d01a3dd9254653d5613;p=sliver-openvswitch.git diff --git a/utilities/automake.mk b/utilities/automake.mk index 9f2bb6347..ce1c8b232 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -1,12 +1,12 @@ bin_PROGRAMS += \ utilities/ovs-appctl \ - utilities/ovs-controller \ utilities/ovs-dpctl \ utilities/ovs-ofctl \ utilities/ovs-vsctl bin_SCRIPTS += utilities/ovs-pki if HAVE_PYTHON bin_SCRIPTS += \ + utilities/ovs-dpctl-top \ utilities/ovs-l3ping \ utilities/ovs-parse-backtrace \ utilities/ovs-pcap \ @@ -20,10 +20,13 @@ scripts_SCRIPTS += \ utilities/ovs-save scripts_DATA += utilities/ovs-lib +utilities/ovs-lib: $(top_builddir)/config.status + EXTRA_DIST += \ utilities/ovs-check-dead-ifs.in \ utilities/ovs-ctl.in \ utilities/ovs-dev.py \ + utilities/ovs-dpctl-top.in \ utilities/ovs-l3ping.in \ utilities/ovs-lib.in \ utilities/ovs-parse-backtrace.in \ @@ -36,9 +39,9 @@ EXTRA_DIST += \ MAN_ROOTS += \ utilities/ovs-appctl.8.in \ utilities/ovs-benchmark.1.in \ - utilities/ovs-controller.8.in \ utilities/ovs-ctl.8 \ utilities/ovs-dpctl.8.in \ + utilities/ovs-dpctl-top.8.in \ utilities/ovs-l3ping.8.in \ utilities/ovs-ofctl.8.in \ utilities/ovs-parse-backtrace.8 \ @@ -55,8 +58,9 @@ DISTCLEANFILES += \ utilities/ovs-ctl \ utilities/ovs-benchmark.1 \ utilities/ovs-check-dead-ifs \ - utilities/ovs-controller.8 \ utilities/ovs-dpctl.8 \ + utilities/ovs-dpctl-top \ + utilities/ovs-dpctl-top.8 \ utilities/ovs-l3ping \ utilities/ovs-l3ping.8 \ utilities/ovs-lib \ @@ -78,8 +82,8 @@ DISTCLEANFILES += \ man_MANS += \ utilities/ovs-appctl.8 \ utilities/ovs-benchmark.1 \ - utilities/ovs-controller.8 \ utilities/ovs-dpctl.8 \ + utilities/ovs-dpctl-top.8 \ utilities/ovs-l3ping.8 \ utilities/ovs-ofctl.8 \ utilities/ovs-parse-backtrace.8 \ @@ -93,35 +97,31 @@ man_MANS += \ dist_man_MANS += utilities/ovs-ctl.8 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c -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_appctl_LDADD = lib/libopenvswitch.la utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c -utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +utilities_ovs_dpctl_LDADD = lib/libopenvswitch.la utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c utilities_ovs_ofctl_LDADD = \ - ofproto/libofproto.a \ - lib/libopenvswitch.a \ - $(SSL_LIBS) + ofproto/libofproto.la \ + lib/libopenvswitch.la utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c -utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +utilities_ovs_vsctl_LDADD = lib/libopenvswitch.la -if LINUX_DATAPATH +if LINUX 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 $(SSL_LIBS) +utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += utilities/nlmon utilities_nlmon_SOURCES = utilities/nlmon.c -utilities_nlmon_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +utilities_nlmon_LDADD = lib/libopenvswitch.la endif bin_PROGRAMS += utilities/ovs-benchmark utilities_ovs_benchmark_SOURCES = utilities/ovs-benchmark.c -utilities_ovs_benchmark_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +utilities_ovs_benchmark_LDADD = lib/libopenvswitch.la include utilities/bugtool/automake.mk