Move JNI from Argeo Commons to Argeo SLC

[gpl/argeo-slc.git] / Makefile

diff --git a/Makefile b/Makefile
index 8ff57035fcf60494345c49f0f5c338d9265fcf6a..08c9add49a53e80e11f0a6a92d2bdc8a67248c4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi
+all: osgi jni
+       $(MAKE) -f Makefile-rcp.mk all
+
+jni:
+       $(MAKE) -C jni
 
 A2_CATEGORY = org.argeo.slc
 
@@ -9,17 +13,13 @@ 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)
-
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.sdk \
@@ -33,8 +33,15 @@ 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 \
 
+clean:
+       rm -rf $(BUILD_BASE)
+       $(MAKE) -C jni clean
+       $(MAKE) -f Makefile-rcp.mk clean
+
 GRAALVM_HOME = /opt/graalvm-ce
 A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))