From 5b5c922b0ca64abb4ac63f4467e02fcd2221a51a Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Tue, 4 Aug 2015 11:31:22 -0700 Subject: [PATCH] ovn-nbctl: Move ovn-nbctl to utilities directory. Signed-off-by: Alex Wang Acked-by: Russell Bryant --- ovn/.gitignore | 2 -- ovn/automake.mk | 11 +++-------- ovn/utilities/.gitignore | 2 ++ ovn/utilities/automake.mk | 14 +++++++++++--- ovn/{ => utilities}/ovn-nbctl.8.xml | 0 ovn/{ => utilities}/ovn-nbctl.c | 0 tutorial/ovs-sandbox | 2 +- utilities/ovs-sim.in | 2 +- 8 files changed, 18 insertions(+), 15 deletions(-) rename ovn/{ => utilities}/ovn-nbctl.8.xml (100%) rename ovn/{ => utilities}/ovn-nbctl.c (100%) diff --git a/ovn/.gitignore b/ovn/.gitignore index 4c13616b1..5b3bc5560 100644 --- a/ovn/.gitignore +++ b/ovn/.gitignore @@ -5,5 +5,3 @@ /ovn-sb.5 /ovn-sb.gv /ovn-sb.pic -/ovn-nbctl -/ovn-nbctl.8 diff --git a/ovn/automake.mk b/ovn/automake.mk index 1170a0be6..901e71083 100644 --- a/ovn/automake.mk +++ b/ovn/automake.mk @@ -66,20 +66,15 @@ ovn/ovn-nb.5: \ $(srcdir)/ovn/ovn-nb.xml > $@.tmp && \ mv $@.tmp $@ -man_MANS += ovn/ovn-architecture.7 ovn/ovn-nbctl.8 -EXTRA_DIST += ovn/ovn-architecture.7.xml ovn/ovn-nbctl.8.xml -DISTCLEANFILES += ovn/ovn-nbctl.8 ovn/ovn-architecture.7 +man_MANS += ovn/ovn-architecture.7 +EXTRA_DIST += ovn/ovn-architecture.7.xml +DISTCLEANFILES += ovn/ovn-architecture.7 EXTRA_DIST += \ ovn/TODO \ ovn/CONTAINERS.OpenStack.md \ ovn/OVN-GW-HA.md -# ovn-nbctl -bin_PROGRAMS += ovn/ovn-nbctl -ovn_ovn_nbctl_SOURCES = ovn/ovn-nbctl.c -ovn_ovn_nbctl_LDADD = ovn/lib/libovn.la ovsdb/libovsdb.la lib/libopenvswitch.la - include ovn/controller/automake.mk include ovn/lib/automake.mk include ovn/northd/automake.mk diff --git a/ovn/utilities/.gitignore b/ovn/utilities/.gitignore index 1ddc63ec8..8769651fe 100644 --- a/ovn/utilities/.gitignore +++ b/ovn/utilities/.gitignore @@ -1 +1,3 @@ /ovn-ctl.8 +/ovn-nbctl +/ovn-nbctl.8 diff --git a/ovn/utilities/automake.mk b/ovn/utilities/automake.mk index 1373864dd..145ee44f0 100644 --- a/ovn/utilities/automake.mk +++ b/ovn/utilities/automake.mk @@ -2,11 +2,19 @@ scripts_SCRIPTS += \ ovn/utilities/ovn-ctl man_MANS += \ - ovn/utilities/ovn-ctl.8 + ovn/utilities/ovn-ctl.8 \ + ovn/utilities/ovn-nbctl.8 EXTRA_DIST += \ ovn/utilities/ovn-ctl \ - ovn/utilities/ovn-ctl.8.xml + ovn/utilities/ovn-ctl.8.xml \ + ovn/utilities/ovn-nbctl.8.xml DISTCLEANFILES += \ - ovn/utilities/ovn-ctl.8 + ovn/utilities/ovn-ctl.8 \ + ovn/utilities/ovn-nbctl.8 + +# ovn-nbctl +bin_PROGRAMS += ovn/utilities/ovn-nbctl +ovn_utilities_ovn_nbctl_SOURCES = ovn/utilities/ovn-nbctl.c +ovn_utilities_ovn_nbctl_LDADD = ovn/lib/libovn.la ovsdb/libovsdb.la lib/libopenvswitch.la diff --git a/ovn/ovn-nbctl.8.xml b/ovn/utilities/ovn-nbctl.8.xml similarity index 100% rename from ovn/ovn-nbctl.8.xml rename to ovn/utilities/ovn-nbctl.8.xml diff --git a/ovn/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c similarity index 100% rename from ovn/ovn-nbctl.c rename to ovn/utilities/ovn-nbctl.c diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index e2bca9cf4..db469cc66 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -248,7 +248,7 @@ if $built; then fi PATH=$builddir/ovsdb:$builddir/vswitchd:$builddir/utilities:$PATH if $ovn; then - PATH=$builddir/ovn:$builddir/ovn/controller:$builddir/ovn/northd:$PATH + PATH=$builddir/ovn:$builddir/ovn/controller:$builddir/ovn/northd:$builddir/ovn/utilities:$PATH fi export PATH else diff --git a/utilities/ovs-sim.in b/utilities/ovs-sim.in index f77b5d1df..2d9d66d9d 100755 --- a/utilities/ovs-sim.in +++ b/utilities/ovs-sim.in @@ -70,7 +70,7 @@ fi # Put built tools early in $PATH. PATH=$sim_builddir/ovsdb:$sim_builddir/vswitchd:$sim_builddir/utilities:$PATH -PATH=$sim_builddir/ovn:$sim_srcdir/ovn:$sim_builddir/ovn/controller:$sim_builddir/ovn/northd:$PATH +PATH=$sim_builddir/ovn:$sim_srcdir/ovn:$sim_builddir/ovn/controller:$sim_builddir/ovn/northd:$sim_builddir/ovn/utilities:$PATH export PATH rm -rf sandbox -- 2.20.1