X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=6d947e312f9d7b50bc5f6bbcee5057eee1cdeda5;hb=6ff9fe4752ba5122751d5fc4cf03ce1e6f7123f0;hp=0a6d791f77159394b332fa29a7b1c6a8a981340b;hpb=60b3c4fa4c24ff66ca98cecc517d161b38f7cfab;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index 0a6d791f7..6d947e312 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,9 @@
 include sdk.mk
-.PHONY: clean all osgi jni move-swt move-rap
+.PHONY: clean all osgi jni
 
-all: osgi jni
+all: osgi
 	$(MAKE) -f Makefile-rcp.mk all
 
-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
-
-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)
-
 A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
@@ -38,26 +26,7 @@ swt/org.argeo.cms.swt \
 swt/org.argeo.cms.e4 \
 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.jcr.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
-#vpath %.$(MAJOR).$(MINOR).jar .:jcr/$(A2_CATEGORY):swt/$(A2_CATEGORY):swt/rap/$(A2_CATEGORY)
 
 DEP_CATEGORIES = \
 org.argeo.tp \
@@ -67,11 +36,15 @@ 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