[ovs-dev] [ovn-controller-vtep V5 02/12] ovn-nbctl: Move ovn-nbctl to utilities directory.

Alex Wang alexw at nicira.com
Fri Aug 7 07:46:43 UTC 2015


Signed-off-by: Alex Wang <alexw at nicira.com>
---
V5:
- new patch.
---
 ovn/.gitignore                      |    2 --
 ovn/automake.mk                     |   11 +++--------
 ovn/utilities/.gitignore            |    3 +++
 ovn/utilities/automake.mk           |   14 +++++++++++---
 ovn/{ => utilities}/ovn-nbctl.8.xml |    0
 ovn/{ => utilities}/ovn-nbctl.c     |    0
 6 files changed, 17 insertions(+), 13 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 4c13616..5b3bc55 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 1170a0b..901e710 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 1ddc63e..714aaab 100644
--- a/ovn/utilities/.gitignore
+++ b/ovn/utilities/.gitignore
@@ -1 +1,4 @@
 /ovn-ctl.8
+/ovn-nbctl
+/ovn-nbctl.8
+
diff --git a/ovn/utilities/automake.mk b/ovn/utilities/automake.mk
index 1373864..145ee44 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
-- 
1.7.9.5




More information about the dev mailing list