diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-09-28 11:06:37 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2016-09-28 09:14:27 +0000 |
| commit | e958b2b806878dc140b5786e11bad4d23e09d454 (patch) | |
| tree | 0e7153fed4acae53956862ab23740df5b18b9d9f /nsh-plugin/java/Makefile.am | |
| parent | 107dfa021e78d9b84df588286b8e402fc65fb279 (diff) | |
VPP-378: update jvpp package names
Depends on vpp change:
https://gerrit.fd.io/r/#/c/3178
Related Honeycomb change:
https://gerrit.fd.io/r/#/c/3182
Change-Id: If8aa43a646ee64fb98b7d8b4398fbdf221c7dc25
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'nsh-plugin/java/Makefile.am')
| -rw-r--r-- | nsh-plugin/java/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nsh-plugin/java/Makefile.am b/nsh-plugin/java/Makefile.am index a16c846..5e1401a 100644 --- a/nsh-plugin/java/Makefile.am +++ b/nsh-plugin/java/Makefile.am @@ -21,10 +21,9 @@ BUILT_SOURCES = bin_PROGRAMS = CLEANFILES = -nobase_include_HEADERS = jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h +nobase_include_HEADERS = jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h jarfile_jnsh_sfc = jnsh_sfc-$(PACKAGE_VERSION).jar -# fixme update dirs after package in jvpp is changed from org.openvpp.jvpp to io.fd.vpp java_packagedir = io/fd/nsh_sfc/jvpp java_gendir = jvpp/src/main/java resourcesdir = jvpp/src/main/resources @@ -33,15 +32,15 @@ jvpp_gen = jvpp_gen.py lib_LTLIBRARIES = libjvpp_nsh.la -libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h +libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h libjvpp_nsh_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \ -lpthread -lm -lrt -ljvpp_common libjvpp_nsh_la_LDFLAGS = -module libjvpp_nsh_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../ -BUILT_SOURCES = jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h +BUILT_SOURCES = jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h -jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h: defs_nsh_sfc_papi.py +jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h: defs_nsh_sfc_papi.py dir=`pwd`; \ mkdir -p $(java_gendir)/$(java_packagedir); \ cd $(java_gendir)/$(java_packagedir); \ |