Use latest build system

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

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index f09721089c19e71d068d7417b6c9b81ee2f3e325..7f1ed9ee21dd6f52ad897bbe0bf23d34d81e2da2 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,13 +1,13 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi move-rcp
+all: osgi 
 
 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
+       #touch $(BUILD_BASE)/*.rcp/bnd.bnd
 
 A2_CATEGORY = org.argeo.cms
 
@@ -22,11 +22,12 @@ A2_BASE = $(A2_OUTPUT)
 
 DEP_CATEGORIES = \
 org.argeo.cms \
+swt/org.argeo.cms \
 org.argeo.tp \
 org.argeo.tp.apache \
 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 \