From 6066bc7dec3ff45be83c646be31b7eff9f7a54eb Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Tue, 22 Oct 2019 16:48:55 +0200
Subject: finish Makefile and update README

---
 Makefile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8978954..c0840b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
+PATH := vendor/bin:node_modules/.bin:$(PATH)
 GIT_VERSION := $(shell git --no-pager describe --always --tags)
 
 js_sources := $(wildcard src/*.js)
-js_bundles :=  $(js_sources:src/%.js=assets/js/%.bundle.js)
-zip_release := $(GIT_VERSION:%=dist/wcms-%.zip)
+js_bundles := $(js_sources:src/%.js=assets/js/%.bundle.js)
+zip_release := $(GIT_VERSION:%=dist/w_cms_%.zip)
 
-release: clean $(zip_release)
+build: clean $(zip_release)
 
-dist/wcms-%.zip: php_dependencies $(js_bundles)
+install: php_dependencies $(js_bundles)
+
+dist/w_cms_%.zip: install
 	@echo "Building Zip release..."
 	mkdir -p $(dir $@)
 	zip -r $@ \
@@ -23,7 +26,7 @@ dist/wcms-%.zip: php_dependencies $(js_bundles)
 assets/js/%.bundle.js: src/%.js js_dependencies
 	@echo "Building JS Bundles..."
 	mkdir -p $(dir $@)
-	npm run build
+	webpack --env prod
 
 php_dependencies:
 	@echo "Installing PHP dependencies..."
@@ -42,3 +45,4 @@ js_clean:
 	rm -rf node_modules
 
 clean: php_clean js_clean
+	rm -rf dist
-- 
cgit v1.2.3