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 02ca5296230633f39962df7dc3e2aee5b2a07559..29f1a23a382f3dcabe556338fd56c61f8d68fa67 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,35 +1,31 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi
+all: osgi 
 
-A2_CATEGORY = org.argeo.cms.eclipse.rcp
+A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
-rcp/org.argeo.cms.e4.rcp \
-rcp/org.argeo.cms.ui.rcp \
-rcp/org.argeo.swt.minidesktop \
-rcp/org.argeo.swt.specific.rcp \
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
+swt/rcp/org.argeo.swt.specific.rcp \
+swt/rcp/org.argeo.cms.swt.rcp \
+swt/rcp/org.argeo.cms.e4.rcp \
 
 DEP_CATEGORIES = \
 org.argeo.cms \
+swt/org.argeo.cms \
 org.argeo.tp \
-org.argeo.tp.apache \
+org.argeo.tp.crypto \
 org.argeo.tp.jetty \
-org.argeo.tp.eclipse \
-osgi/osgi/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.eclipse \
+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:
        rm -rf $(BUILD_BASE)
 
-VPATH = .:rcp
+VPATH = .:swt/rcp
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file