Refactor Argeo Third Parties categories

[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 d271eb9fc2fb16fa995403968ac7da921903749b..5a1fa46e815a27301ba8f5d21152b9d502f25f53 100644 (file)
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -3,13 +3,15 @@ include ../../sdk.mk
 
 export NO_SDK_LEGAL := true
 
-A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(uname -m)/$(A2_CATEGORY)
-
 MBOX_JNI_SRC=jni/com_sun_mail_mbox
 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)
@@ -25,16 +27,10 @@ retrieve-ee4j-mbox:
        # jni
        rsync -a $(SRC_DIR)/mbox/src/main/cpp/com/sun/mail/mbox/ $(MBOX_JNI_SRC)
        mkdir -p com.sun.mail.mbox/bin
-       javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java
+       javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java
        rm -rf com.sun.mail.mbox/bin
 
-jni-ee4j-mbox:
-       mkdir -p $(A2_NATIVE_CATEGORY)
-       $(CC) -o $(A2_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
-
-A2_CATEGORY = org.argeo.tp.utils
+A2_CATEGORY = org.argeo.tp.sys
 
 BUNDLES = \
 com.sun.mail.mbox \
@@ -42,6 +38,15 @@ com.sun.mail.mbox \
 clean:
        rm -rf $(BUILD_BASE)
 
-DEP_CATEGORIES = org.argeo.tp.utils
+DEP_CATEGORIES = org.argeo.tp.sys
+
+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
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file