X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=5d0ce97ce3865568fd59653bacf9e734da1372b1;hb=3c977f5a414fe6a4ea0fa81da190602d695b39cd;hp=125205d5780122554755ba81e95393ca33bb04c3;hpb=4f53d33d6a65a123ab8f69b8580de1da2e029a0a;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index 125205d57..5d0ce97ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,8 @@
 include sdk.mk
 .PHONY: clean all osgi jni
 
-all: osgi jni move-rap
-	$(MAKE) -f Makefile-rcp.mk
-
-move-swt: osgi
-	mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.swt.minidesktop.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.swt.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.e4.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-
-move-rap: move-swt
-	mkdir -p $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.cli.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
-	touch $(BUILD_BASE)/*.rap/bnd.bnd
+all: osgi
+	$(MAKE) -f Makefile-rcp.mk all
 
 A2_CATEGORY = org.argeo.cms
 
@@ -40,23 +28,6 @@ swt/rap/org.argeo.swt.specific.rap \
 swt/rap/org.argeo.cms.swt.rap \
 swt/rap/org.argeo.cms.swt.rap.cli \
 swt/rap/org.argeo.cms.e4.rap \
-jcr/org.argeo.cms.jcr \
-jcr/org.argeo.cms.ui \
-
-JAVADOC_BUNDLES =  \
-org.argeo.api.uuid \
-org.argeo.api.acr \
-org.argeo.api.cms
-
-JAVADOC_PACKAGES =  \
-org.argeo.api.uuid \
-org.argeo.api.acr \
-org.argeo.api.cms
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
-VPATH = .:jcr:swt:swt/rap
 
 DEP_CATEGORIES = \
 org.argeo.tp \
@@ -66,7 +37,14 @@ osgi/api/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
-org.argeo.tp.jcr
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rap/$(A2_CATEGORY) \
+
+JAVADOC_PACKAGES =  \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms
 
 jni:
 	$(MAKE) -C jni