Add config option to use dlmalloc instead of mheap

[vpp.git] / src / vpp-api / java / Makefile.am

diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am
index 09f2ee5..6d60a24 100644 (file)
--- a/src/vpp-api/java/Makefile.am
+++ b/src/vpp-api/java/Makefile.am
@@ -15,7 +15,7 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --quiet
 
-AM_CFLAGS = @CPU_FLAGS@ -Wall -I${top_srcdir} -I${top_builddir} \
+AM_CFLAGS = @CPU_FLAGS@ @DLMALLOC@ -Wall -I${top_srcdir} -I${top_builddir} \
   -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
   -I@top_srcdir@/plugins -I@top_builddir@/plugins
 
@@ -68,26 +68,21 @@ JAR_FILES += jvpp-registry-$(PACKAGE_VERSION).jar
 jvpp_registry_ok = jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h
 
 jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h: $(jvpp_registry_src_files)
-       @echo "  JAPIGEN  $@"
+       @echo "  JVPP GEN  $@"
        @rm -rf jvpp-registry/target
        @mkdir -p jvpp-registry/target
-       @$(JAVAC) -d jvpp-registry/target $^
-       @$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.VppJNIConnection
-       @$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.JVppRegistryImpl
+       @$(JAVAC) -source 8 -target 8 -d jvpp-registry/target -h jvpp-registry $^
        @touch jvpp-registry.ok
 
 define japigen
-       @echo "  JAPIGEN  $@"
+       @echo "  JVPP GEN  $@"
        @rm -rf jvpp-$(1)/target
        @ @srcdir@/jvpp/gen/jvpp_gen.py --plugin_name $(1) --root_dir jvpp-$(1) \
          -i $(jvpp_$(1)_json_files)
        @find jvpp-$(1)/target -name \*.java > jvpp-$(1).generated.files
        @find @srcdir@/jvpp-$(1) -name \*.java > jvpp-$(1).static.files
-       @$(JAVAC) -classpath jvpp-registry/target \
-         -d jvpp-$(1)/target @jvpp-$(1).generated.files @jvpp-$(1).static.files
-       @$(JAVAH) -force \
-         -classpath jvpp-registry/target:jvpp-$(1)/target \
-         -d jvpp-$(1) io.fd.vpp.jvpp.$(1).$(2)
+       @$(JAVAC) -source 8 -target 8 -classpath jvpp-registry/target \
+         -d jvpp-$(1)/target -h jvpp-$(1) @jvpp-$(1).generated.files @jvpp-$(1).static.files
 endef
 
 #