Merge tag 'v2.3.19' into testing

[gpl/argeo-suite.git] / Makefile

diff --git a/Makefile b/Makefile
index d935cab8d5148d084e071c0a9949a9a082756fef..ad5bd8b73da21e60c8a93677da404c8e7de359b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,27 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi web
 
-all: osgi
+all: web osgi
+       
+install: osgi-install
+
+uninstall: osgi-uninstall
 
 A2_CATEGORY = org.argeo.suite
 
 BUNDLES = \
 org.argeo.app.api \
 org.argeo.app.core \
+org.argeo.app.jcr \
+org.argeo.app.geo \
 org.argeo.app.servlet.odk \
 org.argeo.app.servlet.publish \
 org.argeo.app.theme.default \
 org.argeo.app.profile.acr.fs \
 org.argeo.app.profile.acr.jcr \
+org.argeo.suite.knowledge \
 swt/org.argeo.app.swt \
+swt/org.argeo.app.geo.swt \
 swt/org.argeo.app.ui \
 
 DEP_CATEGORIES = \
@@ -24,7 +32,7 @@ org.argeo.tp.utils \
 org.argeo.tp.publish \
 org.argeo.tp.math \
 org.argeo.tp.earth \
-osgi/api/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
@@ -36,5 +44,13 @@ swt/rap/org.argeo.cms \
 
 clean:
        rm -rf $(BUILD_BASE)
+       make -C js clean
+
+native-deps-debian:
+       sudo apt install npm
+
+## WEB
+web:
+       make -C js all
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk