X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=41cbb631549fb99d1778109d12d52451072e39b3;hb=779b016ad36d8efde46c12041131225f1deb9b39;hp=629027674d38fc8c1a101e932799e440ff701e31;hpb=9d078dbf720379c70d9f06339f4aed00b813b511;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index 629027674..41cbb6315 100644
--- 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
@@ -15,7 +18,10 @@ org.argeo.api.uuid \
 org.argeo.api.acr \
 org.argeo.api.cms \
 org.argeo.cms \
-org.argeo.cms.pgsql \
+org.argeo.cms.sql \
+org.argeo.cms.ssh \
+org.argeo.cms.ux \
+eclipse/org.argeo.ext.equinox.jetty \
 eclipse/org.argeo.cms.servlet \
 eclipse/org.argeo.cms.swt \
 eclipse/org.argeo.cms.e4 \
@@ -45,6 +51,7 @@ org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
 org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rwt \
 org.argeo.tp.eclipse.rap \
 org.argeo.tp.jcr
 
@@ -54,5 +61,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