X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=ad5bd8b73da21e60c8a93677da404c8e7de359b9;hb=7670636cc83ee7311900389d1cbc7e6cde97ea6d;hp=861041c34b84bd85b1571dfe44cac4f1ba78e390;hpb=37c5768d88096f4eb7be02f18770b6a40be5c110;p=gpl%2Fargeo-suite.git diff --git a/Makefile b/Makefile index 861041c..ad5bd8b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ include sdk.mk -.PHONY: clean all osgi +.PHONY: clean all osgi web all: web osgi @@ -14,7 +14,6 @@ org.argeo.app.api \ 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 \ @@ -45,13 +44,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