From 6855f6cdfee8c479f1e0ae440ce87a91ff41a708 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Sat, 9 Apr 2016 03:16:30 +0200
Subject: Python-API: Inital commit of Python bindings for the VPP API. See:
 https://wiki.fd.io/view/VPP/Python_API

Change-Id: If135fc32208c7031787e1935b399d930e0e1ea1f
Signed-off-by: Ole Troan <ot@cisco.com>
---
 build-data/packages/vpp-api.mk   | 23 +++++++++++++++++++++++
 build-data/packages/vpp-japi.mk  | 23 -----------------------
 build-data/platforms/virl.mk     |  2 +-
 build-data/platforms/vpp.mk      |  2 +-
 build-data/platforms/vpp_lite.mk |  2 +-
 5 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 build-data/packages/vpp-api.mk
 delete mode 100644 build-data/packages/vpp-japi.mk

(limited to 'build-data')

diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
new file mode 100644
index 00000000..f1841648
--- /dev/null
+++ b/build-data/packages/vpp-api.mk
@@ -0,0 +1,23 @@
+vpp-api_configure_depend =			\
+	vppinfra-install			\
+	svm-install				\
+	vlib-api-install			\
+	vlib-install				\
+	vnet-install				\
+	vpp-install
+
+vpp-api_CPPFLAGS = $(call installed_includes_fn,	\
+	vppinfra					\
+	svm						\
+	vlib						\
+	vlib-api					\
+	vnet						\
+	vpp)
+
+vpp-api_LDFLAGS = $(call installed_libs_fn,	\
+	vppinfra				\
+	svm					\
+	vlib					\
+	vlib-api)
+
+vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include
diff --git a/build-data/packages/vpp-japi.mk b/build-data/packages/vpp-japi.mk
deleted file mode 100644
index 6f69baa0..00000000
--- a/build-data/packages/vpp-japi.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-vpp-japi_configure_depend =			\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install
-
-vpp-japi_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp)
-
-vpp-japi_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api)
-
-vpp-japi_CPPFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include
diff --git a/build-data/platforms/virl.mk b/build-data/platforms/virl.mk
index f47f3691..3d5274a8 100644
--- a/build-data/platforms/virl.mk
+++ b/build-data/platforms/virl.mk
@@ -18,7 +18,7 @@ virl_native_tools = vppapigen
 virl_uses_dpdk = yes
 
 virl_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \
-	vpp-japi 
+	vpp-api 
 
 vpp_configure_args_virl = --with-dpdk
 vnet_configure_args_virl = --with-dpdk --with-virl
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 04a697d3..c381be19 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -21,7 +21,7 @@ vpp_uses_dpdk = yes
 # vpp_enable_tests = yes
 
 vpp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-japi gmod
+	vpp-api gmod
 
 vpp_configure_args_vpp = --with-dpdk
 vnet_configure_args_vpp = --with-dpdk
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index 9376aa35..4183700e 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -18,7 +18,7 @@ vpp_lite_native_tools = vppapigen
 vpp_lite_uses_dpdk = no
 
 vpp_lite_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-japi gmod
+	vpp-api gmod
 
 vlib_configure_args_vpp_lite = --with-pre-data=128
 
-- 
cgit 1.2.3-korg