From f6ea2229f8c61698391b0d438bcd68661238d766 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 7 Aug 2015 09:15:38 -0400 Subject: [PATCH] (fix) reworked the targets to not always generate static files --- UI/WebServerResources/GNUmakefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile index 1d103c9dd..b0f3645db 100644 --- a/UI/WebServerResources/GNUmakefile +++ b/UI/WebServerResources/GNUmakefile @@ -4,7 +4,9 @@ include ../common.make WEBSERVER_RESOURCE_DIRS = css fonts img js -build-static-files: +.DEFAULT_GOAL := all + +dev: npm install --production @if [ ! -e angular-material/src ]; then \ git submodule init; \ @@ -17,9 +19,10 @@ build-static-files: fi grunt --stack build -all :: build-static-files +all: + @echo "The 'all' target does nothing. Use 'make dev' to generate static files and 'make install' to install them." -install :: +install: @if [ -L "$(SOGO_WEBSERVERRESOURCESDIR)" ]; then \ echo "$(SOGO_WEBSERVERRESOURCESDIR) is a symbolic link (for development?). Installation skipped."; \ else \ @@ -27,13 +30,13 @@ install :: cp -r $(WEBSERVER_RESOURCE_DIRS) $(SOGO_WEBSERVERRESOURCESDIR)/; \ fi -check :: +check: -clean :: +clean: -distclean :: clean +distclean: clean -uninstall :: +uninstall: @if [ -L "$(SOGO_WEBSERVERRESOURCESDIR)" ]; then \ echo "$(SOGO_WEBSERVERRESOURCESDIR) is a symbolic link (for development?). Uninstallation skipped."; \ else \