Fix dependency to javax.websocket

[gpl/argeo-slc.git] / Makefile

diff --git a/Makefile b/Makefile
index 8ff57035fcf60494345c49f0f5c338d9265fcf6a..1aea6cc2ab4c76d1e294c4baf9258cd1477f7fba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ include sdk.mk
 .PHONY: clean all osgi
 
 all: osgi
+       $(MAKE) -f Makefile-rcp.mk all
 
 A2_CATEGORY = org.argeo.slc
 
@@ -9,16 +10,16 @@ BUNDLES = \
 org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
-cms/org.argeo.slc.cms \
+org.argeo.slc.cms \
+org.argeo.slc.repo \
+org.argeo.slc.rpmfactory \
+org.argeo.slc.jcr \
+swt/rap/org.argeo.tool.rap.cli \
 swt/rap/org.argeo.tool.server \
 
-VPATH = .:cms:swt/rap
-
 clean:
        rm -rf $(BUILD_BASE)
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
+       $(MAKE) -f Makefile-rcp.mk clean
 
 DEP_CATEGORIES = \
 org.argeo.tp \
@@ -33,6 +34,8 @@ org.argeo.tp.jcr \
 org.argeo.tp.formats \
 org.argeo.tp.gis \
 org.argeo.cms \
+org.argeo.cms.jcr \
+swt/org.argeo.cms \
 swt/rap/org.argeo.cms \
 
 GRAALVM_HOME = /opt/graalvm-ce