X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp-api%2Fjava%2FMakefile.am;h=26407402fbbfb2992f12300e878d7682044c9f2e;hb=20d1232532e6f6c94c77a125b6c17680e14785b5;hp=b95c1fe47094bc1f6f5a0aead13d7e164a1a2807;hpb=aff7077d2031545a15efd12e7f65eac723799491;p=vpp.git

diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
index b95c1fe4709..26407402fbb 100644
--- a/vpp-api/java/Makefile.am
+++ b/vpp-api/java/Makefile.am
@@ -13,13 +13,13 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall 
+AM_CFLAGS = -Wall
 
-noinst_PROGRAMS = 
+noinst_PROGRAMS =
 BUILT_SOURCES =
-bin_PROGRAMS = 
-CLEANFILES = 
-lib_LTLIBRARIES = 
+bin_PROGRAMS =
+CLEANFILES =
+lib_LTLIBRARIES =
 
 #
 # jvpp-common
@@ -80,20 +80,43 @@ libjvpp_core_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 
 jarfile_jvpp_core = jvpp-core-$(PACKAGE_VERSION).jar
 packagedir_jvpp_core = io/fd/vpp/jvpp/core
-api_file = $(prefix)/../vpp/vpp-api/vpe.api
 
 BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
 
-jvpp-core/defs_vpp_papi.py: $(api_file)
-	@echo "jVpp API"
-	vppapigen --input $(api_file) --python jvpp-core/defs_vpp_papi.py
-
-jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h jvpp-core/defs_vpp_papi.py
+jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h:		\
+    jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h	\
+    $(prefix)/../vnet/vnet/af_packet.api.json		\
+    $(prefix)/../vnet/vnet/netmap.api.json		\
+    $(prefix)/../vnet/vnet/vhost_user.api.json		\
+    $(prefix)/../vpp/vpp-api/vpe.api.json		\
+    $(prefix)/../vnet/vnet/gre.api.json			\
+    $(prefix)/../vnet/vnet/ip.api.json 			\
+    $(prefix)/../vnet/vnet/l2tp.api.json		\
+    $(prefix)/../vnet/vnet/tap.api.json 		\
+    $(prefix)/../vnet/vnet/vxlan.api.json		\
+    $(prefix)/../vnet/vnet/vxlan_gpe.api.json	\
+    $(prefix)/../vnet/vnet/tap.api.json			\
+    $(prefix)/../vnet/vnet/bfd.api.json
 	cp -rf @srcdir@/jvpp-core/* -t jvpp-core/
 	mkdir -p jvpp-core/target
 	cd jvpp-core \
 		&& mkdir -p types dto future callfacade callback notification \
-		&& @srcdir@/jvpp/gen/jvpp_gen.py -i defs_vpp_papi.py --plugin_name core \
+		&& @srcdir@/jvpp/gen/jvpp_gen.py  --plugin_name core \
+		    -i $(prefix)/../vpp/vpp-api/vpe.api.json \
+		    $(prefix)/../vnet/vnet/af_packet.api.json \
+		    $(prefix)/../vnet/vnet/netmap.api.json \
+		    $(prefix)/../vnet/vnet/vhost_user.api.json \
+		    $(prefix)/../vnet/vnet/gre.api.json \
+		    $(prefix)/../vnet/vnet/interface.api.json \
+		    $(prefix)/../vnet/vnet/l2.api.json \
+		    $(prefix)/../vnet/vnet/l2tp.api.json \
+		    $(prefix)/../vnet/vnet/map.api.json \
+		    $(prefix)/../vnet/vnet/ip.api.json \
+		    $(prefix)/../vnet/vnet/span.api.json \
+		    $(prefix)/../vnet/vnet/tap.api.json \
+		    $(prefix)/../vnet/vnet/vxlan.api.json \
+		    $(prefix)/../vnet/vnet/vxlan_gpe.api.json \
+		    $(prefix)/../vnet/vnet/bfd.api.json \
 		&& cp -rf types dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \
 		&& rm -rf types dto future callfacade callback notification *.java
 
@@ -104,6 +127,7 @@ jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: jvpp-registry/io_fd_vpp_jvpp_VppJN
 		jvpp-core/$(packagedir_jvpp_core)/notification/*.java \
 		jvpp-core/$(packagedir_jvpp_core)/future/*.java 	\
 		jvpp-core/$(packagedir_jvpp_core)/callfacade/*.java 	\
+		jvpp-core/$(packagedir_jvpp_core)/test/*.java 	\
 		|| (echo "jvpp-core compilation failed: $$?"; exit 1)
 	$(JAVAH) -force -classpath jvpp-registry/target:jvpp-core/target -d jvpp-core io.fd.vpp.jvpp.core.JVppCoreImpl