X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=4eb1de3758039444ed70136ba47567fa04dd9826;hb=9cfc7842603c9c09d686ab9972099ed0a7c22a6e;hp=4f2a4146cf5dda6f8e74a63d191edd746558dcb5;hpb=d6c9d33b61e475914d3f8d7534374ed30eca8150;p=gpl%2Fargeo-suite.git

diff --git a/Makefile b/Makefile
index 4f2a414..4eb1de3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi web
 
-all: osgi
+all: web osgi
 	
 install: osgi-install
 
@@ -13,14 +13,16 @@ 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 \
-org.argeo.product.knowledge \
 
 DEP_CATEGORIES = \
 org.argeo.tp \
@@ -30,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 \
@@ -42,5 +44,10 @@ swt/rap/org.argeo.cms \
 
 clean:
 	rm -rf $(BUILD_BASE)
+	make -C js clean
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+## WEB
+web:
+	make -C js all
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk