X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=861041c34b84bd85b1571dfe44cac4f1ba78e390;hb=be0d3b8c6d90256157ebf0ba9dd7a8703165ba6b;hp=1a573a58ace6828bd7b23a408d53f2b48103ebed;hpb=8461b428020f696557b4485a6eda7ca61494b8bd;p=gpl%2Fargeo-suite.git

diff --git a/Makefile b/Makefile
index 1a573a5..861041c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,39 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-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.geo.js \
 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 \
 
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
 DEP_CATEGORIES = \
 org.argeo.tp \
-org.argeo.tp.jetty \
+org.argeo.tp.httpd \
 org.argeo.tp.jcr \
 org.argeo.tp.utils \
-org.argeo.tp.gis \
-osgi/api/org.argeo.tp.osgi \
+org.argeo.tp.publish \
+org.argeo.tp.math \
+org.argeo.tp.earth \
+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 \
@@ -38,4 +46,12 @@ swt/rap/org.argeo.cms \
 clean:
 	rm -rf $(BUILD_BASE)
 
+## WEB
+web:
+	cd org.argeo.app.geo.js && npm run build
+
+npm-install:
+	cd org.argeo.app.geo.js && npm install
+
+
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file