From b04bac9902e4bbb6ac97ae47a133a7b40a33f764 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 29 Mar 2023 08:02:56 +0200
Subject: [PATCH] Simplify mbox native build

---
 Makefile                                              |  4 +++-
 rebuild/org.argeo.tp.utils/Makefile                   |  9 ++++++++-
 .../jni/com_sun_mail_mbox/.gitignore                  |  2 --
 .../org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile | 11 -----------
 4 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore
 delete mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile

diff --git a/Makefile b/Makefile
index bdab034..1136d20 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,9 @@ distribution:
 clean:
 	make -C repackage clean
 	make -C rebuild clean
-	
+
+native-deps-debian:
+	sudo apt install liblockfile-dev
 
 clean-origin-cache:
 	rm -rf $(HOME)/.cache/argeo/build
diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index aeede2e..f2fb376 100644
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -4,8 +4,9 @@ include ../../sdk.mk
 export NO_SDK_LEGAL := true
 
 MBOX_JNI_SRC=jni/com_sun_mail_mbox
+MBOX_TARGET_EXEC=libmbox.so
 
-all: retrieve-ee4j-mbox osgi
+all: retrieve-ee4j-mbox osgi jni-ee4j-mbox
 
 retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail
 retrieve-ee4j-mbox:
@@ -24,6 +25,12 @@ 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 = \
diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore
deleted file mode 100644
index bf4c7b2..0000000
--- a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.h
-/*.c
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile
deleted file mode 100644
index 4eb8341..0000000
--- a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-include ../../../../sdk.mk
-
-NATIVE_PACKAGE := com_sun_mail_mbox
-
-TARGET_EXEC := libJava_$(NATIVE_PACKAGE).so
-
-# sudo apt install liblockfile-dev
-
-build:
-	mkdir -p $(SDK_BUILD_BASE)/jni
-	$(CC) -o $(SDK_BUILD_BASE)/jni/$(TARGET_EXEC) -shared -fPIC -fpic -Wl,-soname,$(TARGET_EXEC).1.6 -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux *.c
-- 
2.30.2