Run npm install before build

[gpl/argeo-suite.git] / js / Makefile

diff --git a/js/Makefile b/js/Makefile
index 1e8cd432f1537c114cbccf9a462018f45c89b960..21c038fe9d75fb506385b6337df13876bd974703 100644 (file)
--- 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-install webpack osgi
 
 webpack:
        npm run build-prod
@@ -17,10 +17,10 @@ clean:
        $(foreach bundle, $(BUNDLES), rm -rf $(bundle)/org) 
 
 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