API: Cleaning up message naming that does not follow the conventions

[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 c8dba9e..4f1f7ed 100644 (file)
--- a/src/vpp-api/java/Makefile.am
+++ b/src/vpp-api/java/Makefile.am
@@ -19,7 +19,7 @@ AM_CFLAGS = -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 =
@@ -34,14 +34,14 @@ 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 = shared -rpath /none -no-undefined
 
 JVPP_LIBS = \
   libjvpp_common.la \
   $(top_builddir)/libvppinfra.la \
   $(top_builddir)/libvlibmemoryclient.la \
-  $(top_builddir)/libvlibapi.la \
   $(top_builddir)/libsvm.la \
   -lpthread -lm -lrt
 
@@ -128,6 +128,26 @@ jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h: $(jvpp_registry_ok) $(jvpp_acl_json_f
        $(call japigen,acl,JVppAclImpl)
 endif
 
+#
+# 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
+
 #
 # SNAT Plugin
 #
@@ -217,7 +237,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)