X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fjava%2FMakefile.am;h=09f2ee5b2f5161b5cab502abdf0c68048044fa77;hb=9d42087;hp=117616b1ad942f50555d80c42f5a56a7d5b7bc2c;hpb=ef6e54de4a52b1f8b37c6f074b6803e54d5db327;p=vpp.git diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am index 117616b1ad9..09f2ee5b2f5 100644 --- a/src/vpp-api/java/Makefile.am +++ b/src/vpp-api/java/Makefile.am @@ -13,12 +13,13 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 +AM_LIBTOOLFLAGS = --quiet -AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir} \ +AM_CFLAGS = @CPU_FLAGS@ -Wall -I${top_srcdir} -I${top_builddir} \ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \ -I@top_srcdir@/plugins -I@top_builddir@/plugins -AM_LDFLAGS = -module -shared -avoid-version -rpath /none -no-undefined +AM_LDFLAGS = -shared -avoid-version -rpath /none -no-undefined BUILT_SOURCES = bin_PROGRAMS = @@ -33,9 +34,16 @@ CLEANDIRS = nobase_include_HEADERS = \ jvpp-common/jvpp_common.h -noinst_LTLIBRARIES += libjvpp_common.la +lib_LTLIBRARIES = libjvpp_common.la libjvpp_common_la_SOURCES = jvpp-common/jvpp_common.c -libjvpp_common_la_LDFLAGS = +libjvpp_common_la_LDFLAGS = shared -rpath /none -no-undefined + +JVPP_LIBS = \ + libjvpp_common.la \ + $(top_builddir)/libvppinfra.la \ + $(top_builddir)/libvlibmemoryclient.la \ + $(top_builddir)/libsvm.la \ + -lpthread -lm -lrt # # jvpp-registry (connection management + plugin registry) @@ -45,7 +53,8 @@ noinst_LTLIBRARIES += libjvpp_registry.la libjvpp_registry_la_SOURCES = jvpp-registry/jvpp_registry.c libjvpp_registry_la_CPPFLAGS = -Ijvpp-registry -libjvpp_registry_la_LIBAD = libjvpp_common.la +libjvpp_registry_la_LIBADD = $(JVPP_LIBS) +libjvpp_registry_la_DEPENDENCIES = libjvpp_common.la packagedir_jvpp_registry = io/fd/vpp/jvpp jvpp_registry_src_files := \ @@ -71,10 +80,11 @@ define japigen @echo " JAPIGEN $@" @rm -rf jvpp-$(1)/target @ @srcdir@/jvpp/gen/jvpp_gen.py --plugin_name $(1) --root_dir jvpp-$(1) \ - -i $(jvpp_$(1)_json_files) > /dev/null - @find jvpp-$(1)/target -name \*.java > jvpp-$(1).files + -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).files + -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) @@ -86,12 +96,18 @@ endef noinst_LTLIBRARIES += libjvpp_core.la libjvpp_core_la_SOURCES = jvpp-core/jvpp_core.c jvpp-core/jvpp_core_gen.h libjvpp_core_la_CPPFLAGS = -Ijvpp-registry -Ijvpp-core -BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h +libjvpp_core_la_LIBADD = $(JVPP_LIBS) +libjvpp_core_la_DEPENDENCIES = libjvpp_common.la +BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h JAR_FILES += jvpp-core-$(PACKAGE_VERSION).jar CLEANDIRS += jvpp-core/target + +# Include all VPP API files jvpp_core_json_files = $(shell find @top_builddir@/vnet/ -type f -name '*.api.json') -jvpp_core_json_files += @top_builddir@/vpp/api/vpe.api.json +jvpp_core_json_files += $(shell find @top_builddir@/vpp/ -type f -name '*.api.json') +# except for plugins and unsupported ones: +# jvpp_core_json_files += @top_builddir@/vlibmemory/memclnt.api.json jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: $(jvpp_registry_ok) $(jvpp_core_json_files) $(call japigen,core,JVppCoreImpl) @@ -103,9 +119,10 @@ if ENABLE_ACL_PLUGIN noinst_LTLIBRARIES += libjvpp_acl.la libjvpp_acl_la_SOURCES = jvpp-acl/jvpp_acl.c libjvpp_acl_la_CPPFLAGS = -Ijvpp-acl +libjvpp_acl_la_LIBADD = $(JVPP_LIBS) +libjvpp_acl_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h - JAR_FILES += jvpp-acl-$(PACKAGE_VERSION).jar CLEANDIRS += jvpp-acl/target @@ -116,22 +133,63 @@ jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h: $(jvpp_registry_ok) $(jvpp_acl_json_f endif # -# SNAT Plugin +# GTPU Plugin +# +if ENABLE_GTPU_PLUGIN +noinst_LTLIBRARIES += libjvpp_gtpu.la +libjvpp_gtpu_la_SOURCES = jvpp-gtpu/jvpp_gtpu.c +libjvpp_gtpu_la_CPPFLAGS = -Ijvpp-gtpu +libjvpp_gtpu_la_LIBADD = $(JVPP_LIBS) +libjvpp_gtpu_la_DEPENDENCIES = libjvpp_common.la + +BUILT_SOURCES += jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h +JAR_FILES += jvpp-gtpu-$(PACKAGE_VERSION).jar +CLEANDIRS += jvpp-gtpu/target + +jvpp_gtpu_json_files = @top_builddir@/plugins/gtpu/gtpu.api.json + +jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h: $(jvpp_registry_ok) $(jvpp_gtpu_json_files) + $(call japigen,gtpu,JVppGtpuImpl) +endif + +# +# PPPOE Plugin # -if ENABLE_SNAT_PLUGIN -noinst_LTLIBRARIES += libjvpp_snat.la -libjvpp_snat_la_SOURCES = jvpp-snat/jvpp_snat.c -libjvpp_snat_la_CPPFLAGS = -Ijvpp-snat +if ENABLE_PPPOE_PLUGIN +noinst_LTLIBRARIES += libjvpp_pppoe.la +libjvpp_pppoe_la_SOURCES = jvpp-pppoe/jvpp_pppoe.c +libjvpp_pppoe_la_CPPFLAGS = -Ijvpp-pppoe +libjvpp_pppoe_la_LIBADD = $(JVPP_LIBS) +libjvpp_pppoe_la_DEPENDENCIES = libjvpp_common.la + +BUILT_SOURCES += jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h +JAR_FILES += jvpp-pppoe-$(PACKAGE_VERSION).jar +CLEANDIRS += jvpp-pppoe/target + +jvpp_pppoe_json_files = @top_builddir@/plugins/pppoe/pppoe.api.json -BUILT_SOURCES += jvpp-snat/io_fd_vpp_jvpp_snat_JVppSnatImpl.h +jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h: $(jvpp_registry_ok) $(jvpp_pppoe_json_files) + $(call japigen,pppoe,JVppPppoeImpl) +endif + +# +# NAT Plugin +# +if ENABLE_NAT_PLUGIN +noinst_LTLIBRARIES += libjvpp_nat.la +libjvpp_nat_la_SOURCES = jvpp-nat/jvpp_nat.c +libjvpp_nat_la_CPPFLAGS = -Ijvpp-nat +libjvpp_nat_la_LIBADD = $(JVPP_LIBS) +libjvpp_nat_la_DEPENDENCIES = libjvpp_common.la -JAR_FILES += jvpp-snat-$(PACKAGE_VERSION).jar -CLEANDIRS += jvpp-snat/target +BUILT_SOURCES += jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h +JAR_FILES += jvpp-nat-$(PACKAGE_VERSION).jar +CLEANDIRS += jvpp-nat/target -jvpp_snat_json_files = @top_builddir@/plugins/snat/snat.api.json +jvpp_nat_json_files = @top_builddir@/plugins/nat/nat.api.json -jvpp-snat/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: $(jvpp_registry_ok) $(jvpp_snat_json_files) - $(call japigen,snat,JVppSnatImpl) +jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h: $(jvpp_registry_ok) $(jvpp_nat_json_files) + $(call japigen,nat,JVppNatImpl) endif # @@ -140,6 +198,8 @@ endif if ENABLE_IOAM_PLUGIN noinst_LTLIBRARIES += libjvpp_ioamtrace.la libjvpp_ioamtrace_la_SOURCES = jvpp-ioamtrace/jvpp_ioam_trace.c +libjvpp_ioamtrace_la_LIBADD = $(JVPP_LIBS) +libjvpp_ioamtrace_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h JAR_FILES += jvpp-ioamtrace-$(PACKAGE_VERSION).jar @@ -155,6 +215,8 @@ jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: $(jvpp_registry_ok) # noinst_LTLIBRARIES += libjvpp_ioampot.la libjvpp_ioampot_la_SOURCES = jvpp-ioampot/jvpp_ioam_pot.c +libjvpp_ioampot_la_LIBADD = $(JVPP_LIBS) +libjvpp_ioampot_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h JAR_FILES += jvpp-ioampot-$(PACKAGE_VERSION).jar @@ -170,6 +232,8 @@ jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h: $(jvpp_registry_ok) $(jvp # noinst_LTLIBRARIES += libjvpp_ioamexport.la libjvpp_ioamexport_la_SOURCES = jvpp-ioamexport/jvpp_ioam_export.c +libjvpp_ioamexport_la_LIBADD = $(JVPP_LIBS) +libjvpp_ioamexport_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h JAR_FILES += jvpp-ioamexport-$(PACKAGE_VERSION).jar @@ -197,7 +261,7 @@ all-local: $(JAR_FILES) # # Cleanup # -CLEANFILES = jvpp-registry.ok $(JAR_FILES) $(BUILT_SOURCES) +CLEANFILES = jvpp-registry.ok $(JAR_FILES) $(BUILT_SOURCES) *.files */*.h clean-local: rm -rf $(CLEANDIRS)