Merge remote-tracking branch 'origin/unstable' into testing

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index 629027674d38fc8c1a101e932799e440ff701e31..49a995426246cbd9dbb053f8b6283a523f5876da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 include sdk.mk
 .PHONY: clean all osgi jni
 
-all: osgi jni
-       mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).rap
-       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).rap
+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
 
 A2_CATEGORY = org.argeo.cms
@@ -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/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file