aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2015-12-17 17:32:47 +0000
committerGerrit Code Review <gerrit@projectrotterdam.info>2015-12-17 17:32:47 +0000
commitbe9bf426b9ee78d3650fb5d758cb8c70fff46f70 (patch)
tree3f8a759eb02db5152254a86d11313de2a0757746
parent40341752cc15bd50e15c4f05db59c033ae36e9d0 (diff)
parentf750ac2b79fa150f5ff4d57281d04024658f3f42 (diff)
Merge "Move vppctl to vpp-api-test"
-rw-r--r--build-data/packages/vppctl.mk11
-rw-r--r--build-data/platforms/vpp.mk2
-rw-r--r--vpp-api-test/Makefile.am1
-rw-r--r--[-rwxr-xr-x]vpp-api-test/scripts/vppctl (renamed from vppctl/vppctl)0
-rw-r--r--vppctl/Makefile.am2
-rw-r--r--vppctl/configure.ac4
6 files changed, 2 insertions, 18 deletions
diff --git a/build-data/packages/vppctl.mk b/build-data/packages/vppctl.mk
deleted file mode 100644
index a5f8757b536..00000000000
--- 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 b84fc976ea4..a09b0307db5 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 a818d831b28..ae071bcebe0 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
index b789493f2be..b789493f2be 100755..100644
--- a/vppctl/vppctl
+++ b/vpp-api-test/scripts/vppctl
diff --git a/vppctl/Makefile.am b/vppctl/Makefile.am
deleted file mode 100644
index d556cb2aa5c..00000000000
--- 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 0421019452a..00000000000
--- 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