From dcd09bf2847a73bfabec8fbec138c1880150adbd Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 18 Sep 2016 13:44:50 +0000 Subject: [PATCH] proj/Makefile: Some more attempts to structure the targets Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 17f90d59..86cba5a7 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -76,15 +76,17 @@ cpp: while read f; do d=`dirname $$f`; if [ $$d/generate_code.sh ]; then echo $$f; fi ;\ done -update pull: cvs-update - $(PGIT) pull - touch pull.done - status: for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done cvs status $(addsuffix VERSION,$(CVS_PROJECTS)) $(PGIT) status +purge: + $(PURGE_SH) + +update pull: purge cvs-update git-pull + touch pull.done + cvs-update: rm -f $@.done make $@.done @@ -98,8 +100,11 @@ git-diff: git-pull: $(PGIT) pull -clone diff commit push: - $(PGIT) $@ +git-clone: + $(PGIT) clone + +git-commit: + $(PGIT) commit git-conv-%: [ -e $*/.git ] || { \ @@ -144,12 +149,12 @@ cvs-update.done: cvsdir.done cvs update -dP $(CVS_PROJECTS) touch $@ -pull.done: cvs-update.done clone.done links.done +update.done: purge + +pull.done: cvs-update.done config.done clone.done links.done touch $@ clone.done: $(PGIT) clone touch $@ -purge: - $(PURGE_SH)