X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jni.mk;h=88021833bd3d73c87cc99a8688bc5d8f4ea7ed6d;hb=d19e08fb6c5bcef35956e91766f00b91294a7352;hp=915098b5c96f4d7aad17a75533a733b2daaebb82;hpb=97a0c22b8400fb580676fa3ee508c381078fc73c;p=cc0%2Fargeo-build.git

diff --git a/jni.mk b/jni.mk
index 915098b..8802183 100644
--- a/jni.mk
+++ b/jni.mk
@@ -1,11 +1,23 @@
 ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
-include $(ARGEO_BUILD_BASE)osgi.mk
+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
+
+# The following variables have default values which can be overriden
+# DEP_NATIVE        space-separated logical names of named depdencies
+# DEP_INCLUDES      additional includes
+# DEP_LIBS          additional native libraries
+DEP_NATIVE ?=
+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)
-CFLAGS = -O3 -fPIC
+LDFLAGS ?= -shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(MAJOR).$(MINOR) $(DEP_LIBS)
+CFLAGS ?= -O3 -fPIC
 
 SRC_DIRS := . 
 
@@ -15,14 +27,21 @@ 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_INCLUDES)
+INC_DIRS := $(shell find $(SRC_DIRS) -type d) $(JAVA_HOME)/include $(JAVA_HOME)/include/linux $(DEP_INCLUDES)
 
-.PHONY: clean all ide
 all: $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
 clean:
+	$(RM) $(BUILD_DIR)/*.o
 	$(RM) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
+install:
+	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
+
+uninstall:
+	$(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')
 # Objects (example.cpp to ./org_example_core/example.cpp.o)
@@ -51,3 +70,5 @@ $(BUILD_DIR)/%.cpp.o: %.cpp
 
 # Include the .d makefiles. (- pefix suppress errors if not found)
 -include $(DEPS)
+
+.PHONY: clean all install uninstall