From 8afa1a2c1a0b26d03b80485d3d14a4893573b491 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 11 Dec 2013 19:25:42 +0000 Subject: [PATCH] projects-dir.mk: Beautification Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 1b588119..b59fbf9c 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -1,15 +1,21 @@ -CVS_DIRS = $(dir $(wildcard */CVS)) +CVS_PROJECTS = $(dir $(wildcard */CVS)) + +ifneq ($(wildcard projects.txt),) +PROJECTS = $(shell cat projects.txt | sed '/^ *#/ d') +else +PROJECTS = fill me +endif WHOAMI = $(shell id -un) RGIT = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh)) all: - for f in `cat projects.txt`; do make -C $$f || break; done + por p in $(PROJECTS); do make -C $$p || break; done clean: - for f in `cat projects.txt | sed '/^ *#/ d'`; do make -C $$f clean || break; done + por p in $(PROJECTS); do make -C $$p clean || break; done cpp: - @find `cat projects.txt` -name '*.cpp' | grep /worker/ | grep -ve "old\|tmp\|nomake\|new" | \ + @find $(PROJECTS) -name '*.cpp' | grep /worker/ | grep -ve "old\|tmp\|nomake\|new" | \ while read f; do d=`dirname $$f`; if [ $$d/generate_code.sh ]; then echo $$f; fi ;\ done @@ -17,6 +23,6 @@ clone diff commit push: $(RGIT) $@ update pull: - cvs update -dP $(CVS_DIRS) + cvs update -dP $(CVS_PROJECTS) $(RGIT) pull