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

[lgpl/argeo-commons.git] / Makefile-rcp.mk

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index e8009c732d1762768d9a3a0e89b13baf657cd971..29f1a23a382f3dcabe556338fd56c61f8d68fa67 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,37 +1,26 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi move-rcp
-
-move-rcp: osgi
-       mkdir -p $(A2_OUTPUT)/swt/rcp/$(A2_CATEGORY)
-       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rcp.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rcp/$(A2_CATEGORY)
-       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rcp.cli.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rcp/$(A2_CATEGORY)
-       touch $(BUILD_BASE)/*.rcp/bnd.bnd
+all: osgi 
 
 A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
 swt/rcp/org.argeo.swt.specific.rcp \
 swt/rcp/org.argeo.cms.swt.rcp \
-swt/rcp/org.argeo.cms.swt.rcp.cli \
 swt/rcp/org.argeo.cms.e4.rcp \
 
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
 DEP_CATEGORIES = \
 org.argeo.cms \
 swt/org.argeo.cms \
 org.argeo.tp \
-org.argeo.tp.apache \
+org.argeo.tp.crypto \
 org.argeo.tp.jetty \
 osgi/equinox/org.argeo.tp.eclipse \
-osgi/osgi/org.argeo.tp.osgi \
+osgi/api/org.argeo.tp.osgi \
 swt/rcp/org.argeo.tp.swt \
 lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
-org.argeo.tp.jcr
 
 
 clean: