[brooklyn-ui] branch master updated: fix makefile semantics

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b3c20e  fix makefile semantics
7b3c20e is described below

commit 7b3c20e8e01e9873147c6a53482f95714f8326e0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon May 17 18:48:30 2021 +0100

    fix makefile semantics
---
 ui-modules/shared/Makefile.include | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/ui-modules/shared/Makefile.include b/ui-modules/shared/Makefile.include
index ea02669..0765a29 100644
--- a/ui-modules/shared/Makefile.include
+++ b/ui-modules/shared/Makefile.include
@@ -19,13 +19,12 @@ default: dev
 
 utils_clean:
 	@echo "Cleaning utils modules..."
-	cd ../utils
-	rm -rf ./node_modules
+	cd ../utils && rm -rf ./node_modules
 
 utils_install:
 	@echo "Installing utils npm modules..."
-	cd ../utils
-	npm install
+	cd ../utils && npm install
+
 
 build:
 	@echo "Building production bundle..."
@@ -33,13 +32,13 @@ build:
 
 local_clean:
 	@echo "Cleaning modules and builds..."
-	@rm -rf ./node_modules ./dist
+	rm -rf ./node_modules ./dist
 
 clean:	utils_clean local_clean
 
 dev:
 	@echo "Starting dev web server..."
-	@npm start
+	npm start
 
 server: build
 	@echo "Starting api proxy server..."
@@ -47,17 +46,17 @@ server: build
 
 local_install:
 	@echo "Installing npm modules..."
-	@npm install
+	npm install
 
 install:	utils_install local_install
 
 test:
 	@echo "Running tests..."
-	@npm test
+	npm test
 
 setup: clean install
 
 war:
-	@mvn clean install
+	mvn clean install
 
-.PHONY: build clean deploy dev install server setup test war
+.PHONY: build utils_clean local_clean clean deploy dev utils_install local_install install server setup test war