Adapt SWT build

diff --git a/Makefile b/Makefile
index 3b432b84972c339cdffe0fadc3c250e3dab93d14..4de934b22611f9325fa4fcd389ec3665128947f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ org.argeo.cms.lib.jetty \
 org.argeo.cms.lib.equinox \
 org.argeo.cms.lib.sshd \
 org.argeo.cms.lib.pgsql \
+swt/org.argeo.swt.minidesktop \
 swt/org.argeo.cms.swt \
 swt/org.argeo.cms.e4 \
 swt/rap/org.argeo.swt.specific.rap \
@@ -47,7 +48,7 @@ org.argeo.api.cms
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 A2_BASE = $(A2_OUTPUT)
 
-VPATH = .:eclipse:rap:jcr:swt:swt/rap
+VPATH = .:jcr:swt:swt/rap
 
 DEP_CATEGORIES = \
 org.argeo.tp \

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 8b96683fc389da57f1eda4e0e39664630f3b748e..6dfa39824315a31c82f0c60672f174bbda642f08 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -6,7 +6,6 @@ all: osgi
 A2_CATEGORY = org.argeo.cms.eclipse.rcp
 
 BUNDLES = \
-rcp/org.argeo.swt.minidesktop \
 swt/rcp/org.argeo.swt.specific.rcp \
 swt/rcp/org.argeo.cms.swt.rcp \
 swt/rcp/org.argeo.cms.swt.rcp.cli \
@@ -31,6 +30,6 @@ org.argeo.tp.jcr
 clean:
        rm -rf $(BUILD_BASE)
 
-VPATH = .:rcp:swt/rcp
+VPATH = .:swt/rcp
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file