X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jni.mk;h=1892613b12fcc9a9163b4f547f989c43a203e5cf;hb=HEAD;hp=2bbcf44ab732104599f0b34a961a0284795ab89c;hpb=7d19aef426a026deea2b2f41d2b5f87bce948798;p=cc0%2Fargeo-build.git

diff --git a/jni.mk b/jni.mk
index 2bbcf44..1892613 100644
--- a/jni.mk
+++ b/jni.mk
@@ -2,21 +2,21 @@ ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(ARGEO_BUILD_BASE)common.mk
 
 # The following variables should be declared in the including Makefile:
-# NATIVE_PACKAGE	this native package name
-# A2_CATEGORY		the (single) a2 category the bundles will belong to
+# NATIVE_PACKAGE    this native package name
+# A2_CATEGORY       the (single) a2 category the bundles will belong to
 
 # The following variables have default values which can be overriden
-# DEP_NATIVE		space-separated logical names of named depdencies
-# ADDITIONAL_INC	additional includes
-# ADDITIONAL_LIBS	additional native libraries
+# DEP_NATIVE        space-separated logical names of named depdencies
+# DEP_INCLUDES      additional includes
+# DEP_LIBS          additional native libraries
 DEP_NATIVE ?=
-ADDITIONAL_INC ?= $(foreach dep, $(DEP_NATIVE), /usr/include/$(dep))
-ADDITIONAL_LIBS ?= $(foreach dep, $(DEP_NATIVE), -l$(dep))
+DEP_INCLUDES ?= $(foreach dep, $(DEP_NATIVE), /usr/include/$(dep))
+DEP_LIBS ?= $(foreach dep, $(DEP_NATIVE), -l$(dep))
 
 A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
-TARGET_EXEC := libJava_$(NATIVE_PACKAGE).so
+TARGET_EXEC := libJava_$(NATIVE_PACKAGE).$(major).$(minor).so
 
-LDFLAGS ?= -shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(MAJOR).$(MINOR) $(ADDITIONAL_LIBS)
+LDFLAGS ?= -shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(major).$(minor).$(micro) $(DEP_LIBS)
 CFLAGS ?= -O3 -fPIC
 
 SRC_DIRS := . 
@@ -27,7 +27,7 @@ SRC_DIRS := .
 BUILD_DIR := $(SDK_BUILD_BASE)/jni/$(NATIVE_PACKAGE)
 
 # Include directories
-INC_DIRS := $(shell find $(SRC_DIRS) -type d) $(JAVA_HOME)/include $(JAVA_HOME)/include/linux $(ADDITIONAL_INC)
+INC_DIRS := $(shell find $(SRC_DIRS) -type d) $(JAVA_HOME)/include $(JAVA_HOME)/include/linux $(DEP_INCLUDES)
 
 all: $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
@@ -36,10 +36,11 @@ clean:
 	$(RM) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
 install:
-	$(CP) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC) $(A2_NATIVE_INSTALL_TARGET)
+	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
 uninstall:
-	$(RM) $(A2_NATIVE_INSTALL_TARGET)/$(TARGET_EXEC)
+	$(RM) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)/$(TARGET_EXEC)
+	@if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
 
 # Sources
 SRCS := $(shell find $(SRC_DIRS) -name '*.cpp' -or -name '*.c' -or -name '*.s')