From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 10 Jul 2022 10:13:51 +0000 (+0200)
Subject: Adapt SWT build
X-Git-Tag: v2.3.10~126
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=fa0040a5e9655896bb32c4db7392cf1f08f8be63

Adapt SWT build
---

diff --git a/Makefile b/Makefile
index 3b432b849..4de934b22 100644
--- 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 8b96683fc..6dfa39824 100644
--- 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