From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Mar 2022 11:01:13 +0000 (+0100)
Subject: Better integrate RCP build
X-Git-Tag: v2.3.10~243
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=336a1e296b410ff549f11aa95e3979d18951874e

Better integrate RCP build
---

diff --git a/Makefile b/Makefile
index daea875a6..49a995426 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 include sdk.mk
 .PHONY: clean all osgi jni
 
-all: osgi jni
+all: osgi jni move-rap
+	$(MAKE) -f Makefile-rcp.mk
+
+move-rap:
 	mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
 	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
 	touch $(BUILD_BASE)/*.rap/bnd.bnd
@@ -54,5 +57,6 @@ jni:
 clean:
 	rm -rf $(BUILD_BASE)
 	$(MAKE) -C jni clean
+	$(MAKE) -f Makefile-rcp.mk clean
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file