X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=e85160adcf5fbe3f4073b4b3fc2190032d3d60c1;hb=refs%2Fheads%2Funstable;hp=861041c34b84bd85b1571dfe44cac4f1ba78e390;hpb=37c5768d88096f4eb7be02f18770b6a40be5c110;p=gpl%2Fargeo-suite.git

diff --git a/Makefile b/Makefile
index 861041c..e85160a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi web
 
 all: web osgi
 	
@@ -10,11 +10,10 @@ uninstall: osgi-uninstall
 A2_CATEGORY = org.argeo.suite
 
 BUNDLES = \
-org.argeo.app.api \
+org.argeo.api.app \
 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 \
@@ -28,11 +27,15 @@ swt/org.argeo.app.ui \
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.httpd \
+org.argeo.tp.sys \
+org.argeo.tp.sdk \
 org.argeo.tp.jcr \
 org.argeo.tp.utils \
+org.argeo.tp.img \
 org.argeo.tp.publish \
 org.argeo.tp.math \
 org.argeo.tp.earth \
+osgi/equinox/org.argeo.tp.osgi.framework \
 osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
@@ -45,13 +48,13 @@ swt/rap/org.argeo.cms \
 
 clean:
 	rm -rf $(BUILD_BASE)
+	make -C js clean
+
+native-deps-debian:
+	sudo apt install npm
 
 ## WEB
 web:
-	cd org.argeo.app.geo.js && npm run build
-
-npm-install:
-	cd org.argeo.app.geo.js && npm install
-
+	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