Move vppctl to vpp-api-test

Change-Id: I4af0eb9c09d14a1a9803cf1b25bc3d7b814c82cc
Signed-off-by: Damjan Marion <[email protected]>

diff --git a/build-data/packages/vppctl.mk b/build-data/packages/vppctl.mk
deleted file mode 100644 (file)
index a5f8757..0000000
--- 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 b84fc97..a09b030 100644 (file)
--- 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 a818d83..ae071bc 100644 (file)
--- 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 (executable)
new mode 100644 (file)
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 (file)
index d556cb2..0000000
--- 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 (file)
index 0421019..0000000
--- 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