From: Damjan Marion <damarion@cisco.com>
Date: Wed, 16 Dec 2015 19:52:23 +0000 (+0100)
Subject: Move vppctl to vpp-api-test
X-Git-Tag: odp_vpp~2280^2
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=f750ac2b79fa150f5ff4d57281d04024658f3f42;p=odp4vpp.git

Move vppctl to vpp-api-test

Change-Id: I4af0eb9c09d14a1a9803cf1b25bc3d7b814c82cc
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/build-data/packages/vppctl.mk b/build-data/packages/vppctl.mk
deleted file mode 100644
index a5f8757b..00000000
--- a/build-data/packages/vppctl.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-vppctl_configure_depend =			\
-	vppinfra-install			\
-	dpdk-install				\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index b84fc976..a09b0307 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -16,7 +16,7 @@ vpp_arch = native
 vpp_native_tools = vppapigen
 
 vpp_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \
-	vpp-japi vppctl
+	vpp-japi 
 
 vpp_configure_args_vpp = --with-dpdk
 vnet_configure_args_vpp = --with-dpdk
diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am
index a818d831..ae071bce 100644
--- a/vpp-api-test/Makefile.am
+++ b/vpp-api-test/Makefile.am
@@ -32,3 +32,4 @@ vpe_json_test_LDADD = -lvppinfra -lm
 nobase_include_HEADERS = vat/vat.h vat/json_format.h
 
 
+dist_bin_SCRIPTS = scripts/vppctl
diff --git a/vppctl/vppctl b/vpp-api-test/scripts/vppctl
old mode 100755
new mode 100644
similarity index 100%
rename from vppctl/vppctl
rename to vpp-api-test/scripts/vppctl
diff --git a/vppctl/Makefile.am b/vppctl/Makefile.am
deleted file mode 100644
index d556cb2a..00000000
--- a/vppctl/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-dist_bin_SCRIPTS = vppctl
diff --git a/vppctl/configure.ac b/vppctl/configure.ac
deleted file mode 100644
index 04210194..00000000
--- a/vppctl/configure.ac
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT([vppctl], [1.0])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT