From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 29 Mar 2023 07:56:21 +0000 (+0200)
Subject: Fix mbox native build
X-Git-Tag: v2.3.12~1
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=bbd2f326a44fdb04592af571866693f70ffaeed8

Fix mbox native build
---

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index d271eb9..72d581c 100644
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -3,8 +3,6 @@ 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
 
@@ -28,12 +26,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_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
 
 BUNDLES = \
@@ -44,4 +36,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
+