diff options
| -rw-r--r-- | src/vpp-api/java/Makefile.am | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am index 00ee5946945..c8dba9e2524 100644 --- a/src/vpp-api/java/Makefile.am +++ b/src/vpp-api/java/Makefile.am @@ -36,7 +36,14 @@ nobase_include_HEADERS = \ noinst_LTLIBRARIES += libjvpp_common.la libjvpp_common_la_SOURCES = jvpp-common/jvpp_common.c -libjvpp_common_la_LDFLAGS = + +JVPP_LIBS = \ + libjvpp_common.la \ + $(top_builddir)/libvppinfra.la \ + $(top_builddir)/libvlibmemoryclient.la \ + $(top_builddir)/libvlibapi.la \ + $(top_builddir)/libsvm.la \ + -lpthread -lm -lrt # # jvpp-registry (connection management + plugin registry) @@ -46,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 := \ @@ -88,8 +96,10 @@ 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 jvpp_core_json_files = $(shell find @top_builddir@/vnet/ -type f -name '*.api.json') @@ -105,9 +115,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 @@ -124,9 +135,10 @@ if ENABLE_SNAT_PLUGIN noinst_LTLIBRARIES += libjvpp_snat.la libjvpp_snat_la_SOURCES = jvpp-snat/jvpp_snat.c libjvpp_snat_la_CPPFLAGS = -Ijvpp-snat +libjvpp_snat_la_LIBADD = $(JVPP_LIBS) +libjvpp_snat_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-snat/io_fd_vpp_jvpp_snat_JVppSnatImpl.h - JAR_FILES += jvpp-snat-$(PACKAGE_VERSION).jar CLEANDIRS += jvpp-snat/target @@ -142,6 +154,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 @@ -157,6 +171,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 @@ -172,6 +188,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 |