Refactor JavaScript components

[gpl/argeo-suite.git] / Makefile

diff --git a/Makefile b/Makefile
index c41b17e8ac563f5e4e3cb1f638a37a857cbea72f..a2dbe27edfd77bdbd7645a11b8010961398f307e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi web
 
 all: web osgi
        
@@ -45,17 +45,10 @@ swt/rap/org.argeo.cms \
 
 clean:
        rm -rf $(BUILD_BASE)
+       make -C js clean
 
 ## WEB
 web:
-       cd org.argeo.app.geo.js && npm run build
+       make -C js all
 
-npm-install:
-       cd org.argeo.app.geo.js && 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
-
-
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk