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

diff --git a/Makefile b/Makefile
index b04cee306..0a6d791f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 include sdk.mk
 .PHONY: clean all osgi jni move-swt move-rap
 
-all: osgi jni move-rap
-	$(MAKE) -f Makefile-rcp.mk
+all: osgi jni
+	$(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
+	#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)
+	#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
 
@@ -57,6 +57,7 @@ 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 \
@@ -66,7 +67,10 @@ 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
+org.argeo.tp.jcr \
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rap/$(A2_CATEGORY) \
 
 jni:
 	$(MAKE) -C jni