X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp-api%2Fjava%2FMakefile.am;h=d8457dc65b54d46afdaa5743e455219b865c813b;hb=adb13d69add72499faecacc55739e646acda3532;hp=1d8cf4b3f5f91cb0e34c8f58bca53e9e00ee556c;hpb=1a939e845efe697bd3718ff433a523d43417b56b;p=vpp.git

diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
index 1d8cf4b3f5f..d8457dc65b5 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
@@ -47,6 +47,7 @@ libjvpp_registry_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
 	              -lpthread -lm -lrt -ljvpp_common
 libjvpp_registry_la_LDFLAGS = -module
 libjvpp_registry_la_CPPFLAGS = -Ijvpp-registry -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+EXTRA_libjvpp_registry_la_DEPENDENCIES=libjvpp_common.la
 
 jarfile_jvpp_registry = jvpp-registry-$(PACKAGE_VERSION).jar
 packagedir_jvpp_registry = io/fd/vpp/jvpp
@@ -79,32 +80,42 @@ 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)/../vpp/vpp-api/vpe.api.json		\
+    $(prefix)/../vnet/vnet/ip.api.json 			\
+    $(prefix)/../vnet/vnet/tap.api.json 		\
+    $(prefix)/../vnet/vnet/vxlan.api.json
 	cp -rf @srcdir@/jvpp-core/* -t jvpp-core/
 	mkdir -p jvpp-core/target
 	cd jvpp-core \
-		&& mkdir -p dto future callfacade callback notification \
-		&& @srcdir@/jvpp/gen/jvpp_gen.py -i defs_vpp_papi.py --plugin_name core \
-		&& cp -rf dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \
-		&& rm -rf dto future callfacade callback notification *.java
+		&& mkdir -p types dto future callfacade callback notification \
+		&& @srcdir@/jvpp/gen/jvpp_gen.py  --plugin_name core \
+		    -i $(prefix)/../vpp/vpp-api/vpe.api.json \
+		    $(prefix)/../vnet/vnet/interface.api.json \
+		    $(prefix)/../vnet/vnet/l2.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 \
+		&& cp -rf types dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \
+		&& rm -rf types dto future callfacade callback notification *.java
+
 	$(JAVAC) -classpath jvpp-registry/target -d jvpp-core/target jvpp-core/$(packagedir_jvpp_core)/*.java \
+		jvpp-core/$(packagedir_jvpp_core)/types/*.java \
 		jvpp-core/$(packagedir_jvpp_core)/dto/*.java \
 		jvpp-core/$(packagedir_jvpp_core)/callback/*.java \
 		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 \
+		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
-	
+
 $(jarfile_jvpp_core): libjvpp_core.la
 	cp .libs/libjvpp_core.so.0.0.0 jvpp-core/target
 	$(JAR) cf $(JARFLAGS) $@ -C jvpp-core/target .