diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 03b04da2..ff8b2efc 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -75,8 +75,16 @@ cpp: while read f; do d=`dirname $$f`; if [ $$d/generate_code.sh ]; then echo $$f; fi ;\ done -clone diff commit push: - $(PGIT) $@ +update pull: cvs-update + $(PGIT) pull + +status: + for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done + cvs status $(addsuffix VERSION,$(CVS_PROJECTS)) + $(PGIT) status + +cvs-update: cvsdir.done + cvs update -dP $(CVS_PROJECTS) git-push: $(PGIT) push @@ -84,19 +92,11 @@ git-push: git-diff: $(PGIT) diff -cvs-update: cvsdir.done - cvs update -dP $(CVS_PROJECTS) - -update pull: cvs-update - $(PGIT) pull - git-pull: $(PGIT) pull -status: - for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done - cvs status $(addsuffix VERSION,$(CVS_PROJECTS)) - $(PGIT) status +clone diff commit push: + $(PGIT) $@ git-conv-%: [ -e $*/.git ] || { \ @@ -116,6 +116,9 @@ check-conv: projects.txt: echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@ +done.clean: + rm -f *.done + config.done: cvs-update.done make -C ytools config touch $@ @@ -125,13 +128,6 @@ links.done: ln -sf dspc/src/shared dspider-shared touch $@ -%.done: % - touch $@ - - -done.clean: - rm -f *.done - cvsdir.done: if [ ! -d CVS ]; then \ echo -e '$(subst $(newline),\n,${CVSDIR_MIME})' | tee /tmp/test.mime | mimencode -u | tar -xjf - ;\ @@ -141,3 +137,6 @@ cvsdir.done: fi touch $@ +%.done: % + touch $@ +