X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=js%2FMakefile;h=a43be736e62b2984dfa2693412a5fcc8e500f481;hb=694aeb9ff865042652fe2a0e3443c914ede0cebd;hp=1e8cd432f1537c114cbccf9a462018f45c89b960;hpb=d20dc77d29ffae31c6c5b0a45b1b26224b80fc31;p=gpl%2Fargeo-suite.git

diff --git a/js/Makefile b/js/Makefile
index 1e8cd43..a43be73 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -3,9 +3,9 @@ include ../sdk.mk
 A2_CATEGORY = org.argeo.suite
 
 BUNDLES = \
-org.argeo.app.geo.js \
+org.argeo.app.js \
 
-all: webpack osgi
+all: npm-ci webpack osgi
 
 webpack:
 	npm run build-prod
@@ -16,11 +16,14 @@ webpack-dev:
 clean:
 	$(foreach bundle, $(BUNDLES), rm -rf $(bundle)/org) 
 
+npm-ci:
+	npm ci
+	
 npm-install:
-	cd org.argeo.app.geo.js && npm install
+	npm install
 	
 jsdoc:
-	org.argeo.app.geo.js/node_modules/.bin/jsdoc -r org.argeo.app.geo.js/src/org.argeo.app.geo.js \
-		-d $(SDK_BUILD_BASE)/jsdoc/org.argeo.app.geo.js
+	node_modules/.bin/jsdoc -r src \
+		-d $(SDK_BUILD_BASE)/jsdoc/argeo-suite-js
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk