Add install/uninstall make targets

[gpl/argeo-tp.git] / rebuild / org.argeo.tp.utils / Makefile

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index bc2dfdfc05d3bd6f07c6d732e9891bbd03996e32..95dcab8edaec59603d6830edac67cbb89cac4e21 100644 (file)
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -8,6 +8,10 @@ MBOX_TARGET_EXEC=libmbox.so
 
 all: retrieve-ee4j-mbox osgi jni-ee4j-mbox
 
+install: osgi-install
+       
+uninstall: osgi-uninstall
+
 retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail
 retrieve-ee4j-mbox:
        rm -rf $(SRC_DIR)
@@ -26,12 +30,6 @@ retrieve-ee4j-mbox:
        javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java
        rm -rf com.sun.mail.mbox/bin
 
-jni-ee4j-mbox:
-       mkdir -p $(A2_OUTPUT)/lib/linux/x86_64/$(A2_CATEGORY)
-       $(CC) -o $(A2_OUTPUT)/lib/linux/x86_64/$(A2_CATEGORY)/$(MBOX_TARGET_EXEC) \
-        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \
-        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
-
 A2_CATEGORY = org.argeo.tp.utils
 
 BUNDLES = \
@@ -42,4 +40,13 @@ clean:
 
 DEP_CATEGORIES = org.argeo.tp.utils
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
+
+A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
+
+jni-ee4j-mbox:
+       mkdir -p $(A2_NATIVE_CATEGORY)
+       $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
+        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \
+        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
+