Merge "Move vppctl to vpp-api-test"

2015-12-17 17:32:47 +00:00
parent 40341752cc f750ac2b79
commit be9bf426b9
6 changed files with 2 additions and 18 deletions
--- a/build-data/packages/vppctl.mk
+++ b/build-data/packages/vppctl.mk
@ -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
-
-
--- 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
--- 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
--- a/vpp-api-test/scripts/vppctl
+++ b/vpp-api-test/scripts/vppctl
--- a/vppctl/Makefile.am
+++ b/vppctl/Makefile.am
@ -1,2 +0,0 @@
-
-dist_bin_SCRIPTS = vppctl
--- a/vppctl/configure.ac
+++ b/vppctl/configure.ac
@ -1,4 +0,0 @@
-AC_INIT([vppctl], [1.0])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT