diff --git a/1984/Makefile b/1984/Makefile index 8860b7666..159243944 100644 --- a/1984/Makefile +++ b/1984/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1984/anonymous/Makefile b/1984/anonymous/Makefile index bdc1fa9c6..59859084b 100644 --- a/1984/anonymous/Makefile +++ b/1984/anonymous/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1984/decot/Makefile b/1984/decot/Makefile index db5f3cb26..32155a5f4 100644 --- a/1984/decot/Makefile +++ b/1984/decot/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1984/laman/Makefile b/1984/laman/Makefile index 490f17a78..1de6149aa 100644 --- a/1984/laman/Makefile +++ b/1984/laman/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1984/mullender/Makefile b/1984/mullender/Makefile index 471fa6246..7df619c68 100644 --- a/1984/mullender/Makefile +++ b/1984/mullender/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1985/Makefile b/1985/Makefile index 01ed23470..398dc174b 100644 --- a/1985/Makefile +++ b/1985/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto # @@ -77,6 +78,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -91,6 +97,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -105,6 +125,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1985/applin/Makefile b/1985/applin/Makefile index 9cb5c6e80..82ad2b7a1 100644 --- a/1985/applin/Makefile +++ b/1985/applin/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1985/august/Makefile b/1985/august/Makefile index fc16a325f..64bfabaa2 100644 --- a/1985/august/Makefile +++ b/1985/august/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1985/lycklama/Makefile b/1985/lycklama/Makefile index 7a3847864..24915f28c 100644 --- a/1985/lycklama/Makefile +++ b/1985/lycklama/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1985/shapiro/Makefile b/1985/shapiro/Makefile index be4d61391..61f692514 100644 --- a/1985/shapiro/Makefile +++ b/1985/shapiro/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1985/sicherman/Makefile b/1985/sicherman/Makefile index f18060ee9..16c13b836 100644 --- a/1985/sicherman/Makefile +++ b/1985/sicherman/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/Makefile b/1986/Makefile index 2dfb5c6d9..9cff8295e 100644 --- a/1986/Makefile +++ b/1986/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1986/applin/Makefile b/1986/applin/Makefile index 56d7d3e61..1629e7c16 100644 --- a/1986/applin/Makefile +++ b/1986/applin/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/august/Makefile b/1986/august/Makefile index ff9ad2f69..1c437f8a7 100644 --- a/1986/august/Makefile +++ b/1986/august/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/bright/Makefile b/1986/bright/Makefile index 156d2957a..f76438d33 100644 --- a/1986/bright/Makefile +++ b/1986/bright/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/hague/Makefile b/1986/hague/Makefile index 12a5bf46c..efab15ec6 100644 --- a/1986/hague/Makefile +++ b/1986/hague/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/holloway/Makefile b/1986/holloway/Makefile index d3b62500e..877ddb295 100644 --- a/1986/holloway/Makefile +++ b/1986/holloway/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/marshall/Makefile b/1986/marshall/Makefile index f9d1784cb..d904561fc 100644 --- a/1986/marshall/Makefile +++ b/1986/marshall/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/pawka/Makefile b/1986/pawka/Makefile index e75e5a200..faf3aec37 100644 --- a/1986/pawka/Makefile +++ b/1986/pawka/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/stein/Makefile b/1986/stein/Makefile index 74d078800..55dfa08a6 100644 --- a/1986/stein/Makefile +++ b/1986/stein/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1986/wall/Makefile b/1986/wall/Makefile index 2da629c59..f67ddd616 100644 --- a/1986/wall/Makefile +++ b/1986/wall/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/Makefile b/1987/Makefile index b8455e127..64679b3e4 100644 --- a/1987/Makefile +++ b/1987/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1987/biggar/Makefile b/1987/biggar/Makefile index 04d04d57a..5597de76d 100644 --- a/1987/biggar/Makefile +++ b/1987/biggar/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/heckbert/Makefile b/1987/heckbert/Makefile index b9f491a41..05f8efdf6 100644 --- a/1987/heckbert/Makefile +++ b/1987/heckbert/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/hines/Makefile b/1987/hines/Makefile index 6aad698aa..e5bb82d50 100644 --- a/1987/hines/Makefile +++ b/1987/hines/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/korn/Makefile b/1987/korn/Makefile index 88dc9251e..2fd1ca324 100644 --- a/1987/korn/Makefile +++ b/1987/korn/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/lievaart/Makefile b/1987/lievaart/Makefile index 28e817da3..f59df60f5 100644 --- a/1987/lievaart/Makefile +++ b/1987/lievaart/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt ${PROG}2.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -158,11 +159,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -170,6 +181,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/wall/Makefile b/1987/wall/Makefile index bb9865b20..b764c3a85 100644 --- a/1987/wall/Makefile +++ b/1987/wall/Makefile @@ -138,7 +138,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -160,11 +161,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -172,6 +183,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1987/westley/Makefile b/1987/westley/Makefile index 3f5251fba..0152bb333 100644 --- a/1987/westley/Makefile +++ b/1987/westley/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/Makefile b/1988/Makefile index 23778a0c5..e71c017de 100644 --- a/1988/Makefile +++ b/1988/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1988/applin/Makefile b/1988/applin/Makefile index a98f18693..9a0573852 100644 --- a/1988/applin/Makefile +++ b/1988/applin/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= applin.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -170,11 +171,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -182,6 +193,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/dale/Makefile b/1988/dale/Makefile index f9f1451ce..e44cb42fb 100644 --- a/1988/dale/Makefile +++ b/1988/dale/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/isaak/Makefile b/1988/isaak/Makefile index 4d26a198f..d4e93a6f2 100644 --- a/1988/isaak/Makefile +++ b/1988/isaak/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/litmaath/Makefile b/1988/litmaath/Makefile index 1596e000f..c9f0d0695 100644 --- a/1988/litmaath/Makefile +++ b/1988/litmaath/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/phillipps/Makefile b/1988/phillipps/Makefile index d0afd8d57..e942d8e68 100644 --- a/1988/phillipps/Makefile +++ b/1988/phillipps/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/reddy/Makefile b/1988/reddy/Makefile index 121aaace0..60f37b99c 100644 --- a/1988/reddy/Makefile +++ b/1988/reddy/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/robison/Makefile b/1988/robison/Makefile index 0877cfebd..00aafbe1c 100644 --- a/1988/robison/Makefile +++ b/1988/robison/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/spinellis/Makefile b/1988/spinellis/Makefile index 50362c97e..a86425b11 100644 --- a/1988/spinellis/Makefile +++ b/1988/spinellis/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1988/westley/Makefile b/1988/westley/Makefile index 526cef83a..731527b34 100644 --- a/1988/westley/Makefile +++ b/1988/westley/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/Makefile b/1989/Makefile index 952989d91..a3ba0f8d7 100644 --- a/1989/Makefile +++ b/1989/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1989/fubar/Makefile b/1989/fubar/Makefile index f5d111ea9..4c16d3020 100644 --- a/1989/fubar/Makefile +++ b/1989/fubar/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/jar.1/Makefile b/1989/jar.1/Makefile index bdec4fdc0..93053bf8b 100644 --- a/1989/jar.1/Makefile +++ b/1989/jar.1/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -157,11 +158,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -169,6 +180,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/jar.2/Makefile b/1989/jar.2/Makefile index e69d9c98e..2d28a7298 100644 --- a/1989/jar.2/Makefile +++ b/1989/jar.2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/ovdluhe/Makefile b/1989/ovdluhe/Makefile index b0d45a44e..30326a98e 100644 --- a/1989/ovdluhe/Makefile +++ b/1989/ovdluhe/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/paul/Makefile b/1989/paul/Makefile index 428351fd4..e81225dcf 100644 --- a/1989/paul/Makefile +++ b/1989/paul/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/robison/Makefile b/1989/robison/Makefile index 61431c185..e12fbaf89 100644 --- a/1989/robison/Makefile +++ b/1989/robison/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/roemer/Makefile b/1989/roemer/Makefile index 4883518c5..4c3140e76 100644 --- a/1989/roemer/Makefile +++ b/1989/roemer/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/tromp/Makefile b/1989/tromp/Makefile index 96b210b51..371a6f6bd 100644 --- a/1989/tromp/Makefile +++ b/1989/tromp/Makefile @@ -133,7 +133,8 @@ CINCLUDE+= -include stdio.h -include unistd.h -include stdlib.h all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -158,11 +159,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -170,6 +181,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/vanb/Makefile b/1989/vanb/Makefile index 5d0207a7d..64db4f1fa 100644 --- a/1989/vanb/Makefile +++ b/1989/vanb/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1989/westley/Makefile b/1989/westley/Makefile index 61fdbfa8e..b7f8fffa4 100644 --- a/1989/westley/Makefile +++ b/1989/westley/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ver0 ver1 ver2 ver3 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -168,11 +169,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -180,6 +191,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/Makefile b/1990/Makefile index ea395ed56..c167f6a24 100644 --- a/1990/Makefile +++ b/1990/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1990/baruch/Makefile b/1990/baruch/Makefile index 098c0389a..f795e8160 100644 --- a/1990/baruch/Makefile +++ b/1990/baruch/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/cmills/Makefile b/1990/cmills/Makefile index 5b48b443b..3b4978f1a 100644 --- a/1990/cmills/Makefile +++ b/1990/cmills/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/dds/Makefile b/1990/dds/Makefile index 40ab3e6f7..c82a27619 100644 --- a/1990/dds/Makefile +++ b/1990/dds/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/dg/Makefile b/1990/dg/Makefile index 7ecbac741..0233f2a8f 100644 --- a/1990/dg/Makefile +++ b/1990/dg/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/jaw/Makefile b/1990/jaw/Makefile index 6dce36df3..ee5a5042c 100644 --- a/1990/jaw/Makefile +++ b/1990/jaw/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -158,11 +159,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -170,6 +181,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/pjr/Makefile b/1990/pjr/Makefile index d0b32b728..67109f78c 100644 --- a/1990/pjr/Makefile +++ b/1990/pjr/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/scjones/Makefile b/1990/scjones/Makefile index dcc9eb7c5..f12411a11 100644 --- a/1990/scjones/Makefile +++ b/1990/scjones/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/stig/Makefile b/1990/stig/Makefile index 6fef089b5..191a672e7 100644 --- a/1990/stig/Makefile +++ b/1990/stig/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/tbr/Makefile b/1990/tbr/Makefile index 559079030..af83612aa 100644 --- a/1990/tbr/Makefile +++ b/1990/tbr/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/theorem/Makefile b/1990/theorem/Makefile index 8dee068c7..68625bb68 100644 --- a/1990/theorem/Makefile +++ b/1990/theorem/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -170,11 +171,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -182,6 +193,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1990/westley/Makefile b/1990/westley/Makefile index d8acfa51a..c027ef696 100644 --- a/1990/westley/Makefile +++ b/1990/westley/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/Makefile b/1991/Makefile index 9e485bfb3..656d71936 100644 --- a/1991/Makefile +++ b/1991/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1991/ant/Makefile b/1991/ant/Makefile index 960e6e038..7a2d93fa7 100644 --- a/1991/ant/Makefile +++ b/1991/ant/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/brnstnd/Makefile b/1991/brnstnd/Makefile index e234b30c9..7c2360a79 100644 --- a/1991/brnstnd/Makefile +++ b/1991/brnstnd/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/buzzard/Makefile b/1991/buzzard/Makefile index d42faaeb3..41bf3b0c9 100644 --- a/1991/buzzard/Makefile +++ b/1991/buzzard/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/cdupont/Makefile b/1991/cdupont/Makefile index 62ed8951c..efc4a6730 100644 --- a/1991/cdupont/Makefile +++ b/1991/cdupont/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/davidguy/Makefile b/1991/davidguy/Makefile index 70ba2d4a6..0b2dc116c 100644 --- a/1991/davidguy/Makefile +++ b/1991/davidguy/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/dds/Makefile b/1991/dds/Makefile index 406fb11c5..87bc4922e 100644 --- a/1991/dds/Makefile +++ b/1991/dds/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/fine/Makefile b/1991/fine/Makefile index 8c64d834e..e65532eba 100644 --- a/1991/fine/Makefile +++ b/1991/fine/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/rince/Makefile b/1991/rince/Makefile index c73093e24..1483a1a6d 100644 --- a/1991/rince/Makefile +++ b/1991/rince/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1991/westley/Makefile b/1991/westley/Makefile index 4c9edf40e..72babc8db 100644 --- a/1991/westley/Makefile +++ b/1991/westley/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -199,11 +200,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -211,6 +222,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/Makefile b/1992/Makefile index 1ef8a198f..02f42b5cc 100644 --- a/1992/Makefile +++ b/1992/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1992/adrian/Makefile b/1992/adrian/Makefile index 566dbe7ae..de68613aa 100644 --- a/1992/adrian/Makefile +++ b/1992/adrian/Makefile @@ -131,7 +131,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -193,11 +194,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -205,6 +216,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/albert/Makefile b/1992/albert/Makefile index 469986ce5..303fade30 100644 --- a/1992/albert/Makefile +++ b/1992/albert/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/ant/Makefile b/1992/ant/Makefile index 22c068c13..93d9eb9c7 100644 --- a/1992/ant/Makefile +++ b/1992/ant/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/buzzard.1/Makefile b/1992/buzzard.1/Makefile index bdca1464b..fd88ce7ce 100644 --- a/1992/buzzard.1/Makefile +++ b/1992/buzzard.1/Makefile @@ -128,7 +128,8 @@ CPPCLEAN= ${GREP} -v '^. [0-9][0-9]*' all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -179,11 +180,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -191,6 +202,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/buzzard.2/Makefile b/1992/buzzard.2/Makefile index b00665838..a3e4341c6 100644 --- a/1992/buzzard.2/Makefile +++ b/1992/buzzard.2/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/gson/Makefile b/1992/gson/Makefile index ef682283e..0c46aa225 100644 --- a/1992/gson/Makefile +++ b/1992/gson/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules ############### diff --git a/1992/imc/Makefile b/1992/imc/Makefile index e2b7a44df..0ddeb7c53 100644 --- a/1992/imc/Makefile +++ b/1992/imc/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/kivinen/Makefile b/1992/kivinen/Makefile index 2caf15415..1bfc11a5e 100644 --- a/1992/kivinen/Makefile +++ b/1992/kivinen/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/lush/Makefile b/1992/lush/Makefile index 3f57b5653..fbd0fa657 100644 --- a/1992/lush/Makefile +++ b/1992/lush/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/marangon/Makefile b/1992/marangon/Makefile index e39f403d1..57c8493fd 100644 --- a/1992/marangon/Makefile +++ b/1992/marangon/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/nathan/Makefile b/1992/nathan/Makefile index cf5bff358..fe07e4986 100644 --- a/1992/nathan/Makefile +++ b/1992/nathan/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/vern/Makefile b/1992/vern/Makefile index 2b057d785..5d23351ca 100644 --- a/1992/vern/Makefile +++ b/1992/vern/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1992/westley/Makefile b/1992/westley/Makefile index fe68e26d4..560b34377 100644 --- a/1992/westley/Makefile +++ b/1992/westley/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/Makefile b/1993/Makefile index db0b76fdf..8af9c7af6 100644 --- a/1993/Makefile +++ b/1993/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1993/ant/Makefile b/1993/ant/Makefile index 77c937f50..92ac67249 100644 --- a/1993/ant/Makefile +++ b/1993/ant/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/cmills/Makefile b/1993/cmills/Makefile index 78e0959a2..43255a251 100644 --- a/1993/cmills/Makefile +++ b/1993/cmills/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/dgibson/Makefile b/1993/dgibson/Makefile index 957ef3eaf..51882f02f 100644 --- a/1993/dgibson/Makefile +++ b/1993/dgibson/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/ejb/Makefile b/1993/ejb/Makefile index 17c5aede6..db8be2072 100644 --- a/1993/ejb/Makefile +++ b/1993/ejb/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/jonth/Makefile b/1993/jonth/Makefile index c6c4871c2..37d6291e1 100644 --- a/1993/jonth/Makefile +++ b/1993/jonth/Makefile @@ -130,7 +130,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/leo/Makefile b/1993/leo/Makefile index 5da3a3435..df4c895f9 100644 --- a/1993/leo/Makefile +++ b/1993/leo/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= mind all: data ${TARGET} ${ALT_TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/lmfjyh/Makefile b/1993/lmfjyh/Makefile index 66789f14b..a2e28bd0e 100644 --- a/1993/lmfjyh/Makefile +++ b/1993/lmfjyh/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/plummer/Makefile b/1993/plummer/Makefile index d49266247..33d025011 100644 --- a/1993/plummer/Makefile +++ b/1993/plummer/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/rince/Makefile b/1993/rince/Makefile index e676f1369..5ead14a85 100644 --- a/1993/rince/Makefile +++ b/1993/rince/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/schnitzi/Makefile b/1993/schnitzi/Makefile index eb8e4ebc8..26689ea6b 100644 --- a/1993/schnitzi/Makefile +++ b/1993/schnitzi/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1993/vanb/Makefile b/1993/vanb/Makefile index 9fbddd245..4d65ac2b8 100644 --- a/1993/vanb/Makefile +++ b/1993/vanb/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/Makefile b/1994/Makefile index 01b3598a3..202169eb7 100644 --- a/1994/Makefile +++ b/1994/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1994/dodsond1/Makefile b/1994/dodsond1/Makefile index 10b730a00..c0cc0897a 100644 --- a/1994/dodsond1/Makefile +++ b/1994/dodsond1/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/dodsond2/Makefile b/1994/dodsond2/Makefile index 4a1d9da54..ddd7c9970 100644 --- a/1994/dodsond2/Makefile +++ b/1994/dodsond2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/horton/Makefile b/1994/horton/Makefile index 5e16a4967..277c6ef4d 100644 --- a/1994/horton/Makefile +++ b/1994/horton/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/imc/Makefile b/1994/imc/Makefile index 3fb3a69dd..8093d1094 100644 --- a/1994/imc/Makefile +++ b/1994/imc/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/ldb/Makefile b/1994/ldb/Makefile index b04902ee4..b6816353c 100644 --- a/1994/ldb/Makefile +++ b/1994/ldb/Makefile @@ -129,7 +129,8 @@ CFLAGS+= -trigraphs all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/schnitzi/Makefile b/1994/schnitzi/Makefile index 719c3faf3..2b0f1a43e 100644 --- a/1994/schnitzi/Makefile +++ b/1994/schnitzi/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/shapiro/Makefile b/1994/shapiro/Makefile index 1ea8fb9c5..b30a01b2e 100644 --- a/1994/shapiro/Makefile +++ b/1994/shapiro/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/smr/Makefile b/1994/smr/Makefile index 7881c60b2..cd84f8aab 100644 --- a/1994/smr/Makefile +++ b/1994/smr/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/tvr/Makefile b/1994/tvr/Makefile index 022010e95..e5f5c5cf5 100644 --- a/1994/tvr/Makefile +++ b/1994/tvr/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/weisberg/Makefile b/1994/weisberg/Makefile index 0fc301123..14a892f8a 100644 --- a/1994/weisberg/Makefile +++ b/1994/weisberg/Makefile @@ -129,7 +129,8 @@ C_LARGE= -De='~(1<<8*sizeof(int)-1)' -Do='(2<<7*sizeof(int))' all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1994/westley/Makefile b/1994/westley/Makefile index e84462091..06eb17cd9 100644 --- a/1994/westley/Makefile +++ b/1994/westley/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/Makefile b/1995/Makefile index 240c73a19..71b8b1dea 100644 --- a/1995/Makefile +++ b/1995/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1995/cdua/Makefile b/1995/cdua/Makefile index f5601233d..1bc474d5d 100644 --- a/1995/cdua/Makefile +++ b/1995/cdua/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/dodsond1/Makefile b/1995/dodsond1/Makefile index 57def7d9d..f3e501f46 100644 --- a/1995/dodsond1/Makefile +++ b/1995/dodsond1/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/dodsond2/Makefile b/1995/dodsond2/Makefile index ee7520701..605126980 100644 --- a/1995/dodsond2/Makefile +++ b/1995/dodsond2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/esde/Makefile b/1995/esde/Makefile index 77b83f5c7..d79d3c38a 100644 --- a/1995/esde/Makefile +++ b/1995/esde/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/garry/Makefile b/1995/garry/Makefile index cbce97523..cc27ea9de 100644 --- a/1995/garry/Makefile +++ b/1995/garry/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/heathbar/Makefile b/1995/heathbar/Makefile index 4eaf160ac..206561c0a 100644 --- a/1995/heathbar/Makefile +++ b/1995/heathbar/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/leo/Makefile b/1995/leo/Makefile index dcb3fb211..f8c5cd2b0 100644 --- a/1995/leo/Makefile +++ b/1995/leo/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/makarios/Makefile b/1995/makarios/Makefile index cb66293d4..ff7ad5f21 100644 --- a/1995/makarios/Makefile +++ b/1995/makarios/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/savastio/Makefile b/1995/savastio/Makefile index 335714e67..193236782 100644 --- a/1995/savastio/Makefile +++ b/1995/savastio/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/schnitzi/Makefile b/1995/schnitzi/Makefile index f235affd2..711b7a01a 100644 --- a/1995/schnitzi/Makefile +++ b/1995/schnitzi/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/spinellis/Makefile b/1995/spinellis/Makefile index ff3722b4b..b049681c4 100644 --- a/1995/spinellis/Makefile +++ b/1995/spinellis/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1995/vanschnitz/Makefile b/1995/vanschnitz/Makefile index 83a7ed866..0692725a0 100644 --- a/1995/vanschnitz/Makefile +++ b/1995/vanschnitz/Makefile @@ -125,7 +125,8 @@ LEVEL= 5 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/Makefile b/1996/Makefile index 39572a98d..b052c9aa9 100644 --- a/1996/Makefile +++ b/1996/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1996/august/Makefile b/1996/august/Makefile index 6936f5423..d6e61af5e 100644 --- a/1996/august/Makefile +++ b/1996/august/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -157,11 +158,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -169,6 +180,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/dalbec/Makefile b/1996/dalbec/Makefile index 1ce8a62bc..e5473b492 100644 --- a/1996/dalbec/Makefile +++ b/1996/dalbec/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/eldby/Makefile b/1996/eldby/Makefile index 5b8549e65..5fbcb2c8e 100644 --- a/1996/eldby/Makefile +++ b/1996/eldby/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/gandalf/Makefile b/1996/gandalf/Makefile index b8e0a3736..051635885 100644 --- a/1996/gandalf/Makefile +++ b/1996/gandalf/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -156,11 +157,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -168,6 +179,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/huffman/Makefile b/1996/huffman/Makefile index c0ef0039a..ff1cd9bd3 100644 --- a/1996/huffman/Makefile +++ b/1996/huffman/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/jonth/Makefile b/1996/jonth/Makefile index da1a7a762..57083074e 100644 --- a/1996/jonth/Makefile +++ b/1996/jonth/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/rcm/Makefile b/1996/rcm/Makefile index 3ef65fe9a..0f985e944 100644 --- a/1996/rcm/Makefile +++ b/1996/rcm/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/schweikh1/Makefile b/1996/schweikh1/Makefile index 0e56dcc05..d2adc77b8 100644 --- a/1996/schweikh1/Makefile +++ b/1996/schweikh1/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/schweikh2/Makefile b/1996/schweikh2/Makefile index 7224ba46e..feae9eea0 100644 --- a/1996/schweikh2/Makefile +++ b/1996/schweikh2/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/schweikh3/Makefile b/1996/schweikh3/Makefile index 2c21db1c6..8cbc35c2b 100644 --- a/1996/schweikh3/Makefile +++ b/1996/schweikh3/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1996/westley/Makefile b/1996/westley/Makefile index 64bb501ff..882bf7fe8 100644 --- a/1996/westley/Makefile +++ b/1996/westley/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= westley.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/Makefile b/1998/Makefile index 98a839e46..3bcd4b336 100644 --- a/1998/Makefile +++ b/1998/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/1998/banks/Makefile b/1998/banks/Makefile index 8661ac176..3e6f5eb24 100644 --- a/1998/banks/Makefile +++ b/1998/banks/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/bas1/Makefile b/1998/bas1/Makefile index b0dd7194f..171b2654e 100644 --- a/1998/bas1/Makefile +++ b/1998/bas1/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/bas2/Makefile b/1998/bas2/Makefile index 05988a32f..1d20f7788 100644 --- a/1998/bas2/Makefile +++ b/1998/bas2/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/chaos/Makefile b/1998/chaos/Makefile index 578608030..7b346898a 100644 --- a/1998/chaos/Makefile +++ b/1998/chaos/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}_nohalf all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/df/Makefile b/1998/df/Makefile index 9c0e6ad67..e215ee29c 100644 --- a/1998/df/Makefile +++ b/1998/df/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/dlowe/Makefile b/1998/dlowe/Makefile index f00e61875..b550c245c 100644 --- a/1998/dlowe/Makefile +++ b/1998/dlowe/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/dloweneil/Makefile b/1998/dloweneil/Makefile index 0d03c91ea..8a7d0c2b7 100644 --- a/1998/dloweneil/Makefile +++ b/1998/dloweneil/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/dorssel/Makefile b/1998/dorssel/Makefile index c128b686d..f40b785a7 100644 --- a/1998/dorssel/Makefile +++ b/1998/dorssel/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/fanf/Makefile b/1998/fanf/Makefile index c4f4abf0b..4d46ed9eb 100644 --- a/1998/fanf/Makefile +++ b/1998/fanf/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/schnitzi/Makefile b/1998/schnitzi/Makefile index c013df94a..4cf206b77 100644 --- a/1998/schnitzi/Makefile +++ b/1998/schnitzi/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/schweikh1/Makefile b/1998/schweikh1/Makefile index 7b307ae61..a77aad602 100644 --- a/1998/schweikh1/Makefile +++ b/1998/schweikh1/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/schweikh2/Makefile b/1998/schweikh2/Makefile index c6b3eac54..9e9dab5ea 100644 --- a/1998/schweikh2/Makefile +++ b/1998/schweikh2/Makefile @@ -126,7 +126,8 @@ CFLAGS+= -trigraphs all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/schweikh3/Makefile b/1998/schweikh3/Makefile index 8fba65ff2..0dba9c1cd 100644 --- a/1998/schweikh3/Makefile +++ b/1998/schweikh3/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/1998/tomtorfs/Makefile b/1998/tomtorfs/Makefile index 9be0bc204..1812eef51 100644 --- a/1998/tomtorfs/Makefile +++ b/1998/tomtorfs/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/Makefile b/2000/Makefile index 2b66e0835..026455857 100644 --- a/2000/Makefile +++ b/2000/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2000/anderson/Makefile b/2000/anderson/Makefile index 59a471310..275c1a2fb 100644 --- a/2000/anderson/Makefile +++ b/2000/anderson/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/bellard/Makefile b/2000/bellard/Makefile index 19daa781f..708d819d0 100644 --- a/2000/bellard/Makefile +++ b/2000/bellard/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/bmeyer/Makefile b/2000/bmeyer/Makefile index 2a6ea24c9..53f499832 100644 --- a/2000/bmeyer/Makefile +++ b/2000/bmeyer/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/briddlebane/Makefile b/2000/briddlebane/Makefile index 1192ae134..e96800407 100644 --- a/2000/briddlebane/Makefile +++ b/2000/briddlebane/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/dhyang/Makefile b/2000/dhyang/Makefile index 148f4b6fe..09a279876 100644 --- a/2000/dhyang/Makefile +++ b/2000/dhyang/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} test @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -175,11 +176,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -187,6 +198,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/dlowe/Makefile b/2000/dlowe/Makefile index d83a3d4db..fe90b8d75 100644 --- a/2000/dlowe/Makefile +++ b/2000/dlowe/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/jarijyrki/Makefile b/2000/jarijyrki/Makefile index bafdd086b..3cd409959 100644 --- a/2000/jarijyrki/Makefile +++ b/2000/jarijyrki/Makefile @@ -130,7 +130,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/natori/Makefile b/2000/natori/Makefile index c7f2a0d08..cb5f5e966 100644 --- a/2000/natori/Makefile +++ b/2000/natori/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/primenum/Makefile b/2000/primenum/Makefile index a9defc4f4..cd9b2ad16 100644 --- a/2000/primenum/Makefile +++ b/2000/primenum/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/rince/Makefile b/2000/rince/Makefile index e26b75841..1b9fe92f1 100644 --- a/2000/rince/Makefile +++ b/2000/rince/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/robison/Makefile b/2000/robison/Makefile index db53b29d5..80bde6d47 100644 --- a/2000/robison/Makefile +++ b/2000/robison/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/schneiderwent/Makefile b/2000/schneiderwent/Makefile index 1bb1ec757..2332f4786 100644 --- a/2000/schneiderwent/Makefile +++ b/2000/schneiderwent/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/thadgavin/Makefile b/2000/thadgavin/Makefile index 14bbd73b0..b6a301e21 100644 --- a/2000/thadgavin/Makefile +++ b/2000/thadgavin/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -158,11 +159,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -170,6 +181,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2000/tomx/Makefile b/2000/tomx/Makefile index 8d15751e8..c7ebef45f 100644 --- a/2000/tomx/Makefile +++ b/2000/tomx/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/Makefile b/2001/Makefile index 07d3514cc..0899eff92 100644 --- a/2001/Makefile +++ b/2001/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2001/anonymous/Makefile b/2001/anonymous/Makefile index 85d29ce42..c63ce6876 100644 --- a/2001/anonymous/Makefile +++ b/2001/anonymous/Makefile @@ -131,7 +131,8 @@ ALT_TARGET= ${PROG}.ten.64 ${PROG}.bed.64 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -199,11 +200,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -211,6 +222,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/bellard/Makefile b/2001/bellard/Makefile index a30529f7f..56b71a39f 100644 --- a/2001/bellard/Makefile +++ b/2001/bellard/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/cheong/Makefile b/2001/cheong/Makefile index 7e75aeab5..895cc1c58 100644 --- a/2001/cheong/Makefile +++ b/2001/cheong/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/coupard/Makefile b/2001/coupard/Makefile index 4a182c0ed..fb4155958 100644 --- a/2001/coupard/Makefile +++ b/2001/coupard/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/ctk/Makefile b/2001/ctk/Makefile index e35fed605..5efa34090 100644 --- a/2001/ctk/Makefile +++ b/2001/ctk/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/dgbeards/Makefile b/2001/dgbeards/Makefile index c03a55481..847be4230 100644 --- a/2001/dgbeards/Makefile +++ b/2001/dgbeards/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/herrmann1/Makefile b/2001/herrmann1/Makefile index 944c58526..17b5325ee 100644 --- a/2001/herrmann1/Makefile +++ b/2001/herrmann1/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/herrmann2/Makefile b/2001/herrmann2/Makefile index ef2ff8589..861503c33 100644 --- a/2001/herrmann2/Makefile +++ b/2001/herrmann2/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/jason/Makefile b/2001/jason/Makefile index 409714d6b..b83cd2294 100644 --- a/2001/jason/Makefile +++ b/2001/jason/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/kev/Makefile b/2001/kev/Makefile index e84210a75..21474417d 100644 --- a/2001/kev/Makefile +++ b/2001/kev/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/ollinger/Makefile b/2001/ollinger/Makefile index 463883acd..6c57b45a5 100644 --- a/2001/ollinger/Makefile +++ b/2001/ollinger/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/rosten/Makefile b/2001/rosten/Makefile index f2b4638ed..36d187a8c 100644 --- a/2001/rosten/Makefile +++ b/2001/rosten/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/schweikh/Makefile b/2001/schweikh/Makefile index 53d0a409b..c04d1e361 100644 --- a/2001/schweikh/Makefile +++ b/2001/schweikh/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/westley/Makefile b/2001/westley/Makefile index 4639f947b..16f472735 100644 --- a/2001/westley/Makefile +++ b/2001/westley/Makefile @@ -131,7 +131,8 @@ CFLAGS+= -trigraphs all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -166,11 +167,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -178,6 +189,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2001/williams/Makefile b/2001/williams/Makefile index 7fa138391..4a0c03a51 100644 --- a/2001/williams/Makefile +++ b/2001/williams/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/Makefile b/2004/Makefile index 590816c1d..789a11615 100644 --- a/2004/Makefile +++ b/2004/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2004/anonymous/Makefile b/2004/anonymous/Makefile index 7a462998e..ba0d6f25f 100644 --- a/2004/anonymous/Makefile +++ b/2004/anonymous/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/arachnid/Makefile b/2004/arachnid/Makefile index 0c9cd24f2..f05b9e1f3 100644 --- a/2004/arachnid/Makefile +++ b/2004/arachnid/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/burley/Makefile b/2004/burley/Makefile index 8cac08c98..09a286f76 100644 --- a/2004/burley/Makefile +++ b/2004/burley/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/gavare/Makefile b/2004/gavare/Makefile index f41ccad93..199b691f9 100644 --- a/2004/gavare/Makefile +++ b/2004/gavare/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.r3 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/gavin/Makefile b/2004/gavin/Makefile index 3a2971f6c..14dde6ff7 100644 --- a/2004/gavin/Makefile +++ b/2004/gavin/Makefile @@ -133,7 +133,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -173,11 +174,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -185,6 +196,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/hibachi/Makefile b/2004/hibachi/Makefile index dab337b80..b32a5f999 100644 --- a/2004/hibachi/Makefile +++ b/2004/hibachi/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/hoyle/Makefile b/2004/hoyle/Makefile index 0ce9c84fb..7e8a3577c 100644 --- a/2004/hoyle/Makefile +++ b/2004/hoyle/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/jdalbec/Makefile b/2004/jdalbec/Makefile index 5d72971aa..5f372c34e 100644 --- a/2004/jdalbec/Makefile +++ b/2004/jdalbec/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/kopczynski/Makefile b/2004/kopczynski/Makefile index c50f4667e..4e5671b1e 100644 --- a/2004/kopczynski/Makefile +++ b/2004/kopczynski/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/newbern/Makefile b/2004/newbern/Makefile index 29211916f..509370476 100644 --- a/2004/newbern/Makefile +++ b/2004/newbern/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/omoikane/Makefile b/2004/omoikane/Makefile index e61b02f66..915f4e0c3 100644 --- a/2004/omoikane/Makefile +++ b/2004/omoikane/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/schnitzi/Makefile b/2004/schnitzi/Makefile index 2f2ae5a5d..aae8fbc50 100644 --- a/2004/schnitzi/Makefile +++ b/2004/schnitzi/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/sds/Makefile b/2004/sds/Makefile index 6e0ae0564..5d4c272f3 100644 --- a/2004/sds/Makefile +++ b/2004/sds/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/vik1/Makefile b/2004/vik1/Makefile index a2546cc4c..3ba74edab 100644 --- a/2004/vik1/Makefile +++ b/2004/vik1/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2004/vik2/Makefile b/2004/vik2/Makefile index d74e1bf8c..9d9376571 100644 --- a/2004/vik2/Makefile +++ b/2004/vik2/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + # The original vik2 source # # On some systems such as Linux, this source either fails diff --git a/2005/Makefile b/2005/Makefile index 1e051ac5f..3006d86fa 100644 --- a/2005/Makefile +++ b/2005/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2005/aidan/Makefile b/2005/aidan/Makefile index cfc372c11..674164d09 100644 --- a/2005/aidan/Makefile +++ b/2005/aidan/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/anon/Makefile b/2005/anon/Makefile index 35e8b63b3..a6983dc3c 100644 --- a/2005/anon/Makefile +++ b/2005/anon/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/boutines/Makefile b/2005/boutines/Makefile index 72875625f..dbae2899f 100644 --- a/2005/boutines/Makefile +++ b/2005/boutines/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/chia/Makefile b/2005/chia/Makefile index 97058c77b..7a25493fa 100644 --- a/2005/chia/Makefile +++ b/2005/chia/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/giljade/Makefile b/2005/giljade/Makefile index 733867902..14482a8c6 100644 --- a/2005/giljade/Makefile +++ b/2005/giljade/Makefile @@ -130,7 +130,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -157,11 +158,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -169,6 +180,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/jetro/Makefile b/2005/jetro/Makefile index 1dadd3958..417fa824f 100644 --- a/2005/jetro/Makefile +++ b/2005/jetro/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/klausler/Makefile b/2005/klausler/Makefile index 6afeb8f06..079bbba3a 100644 --- a/2005/klausler/Makefile +++ b/2005/klausler/Makefile @@ -128,7 +128,8 @@ DICTIONARY= /usr/share/dict/words /usr/dict/words /usr/lib/dict/words /usr/share all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -168,11 +169,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -180,6 +191,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/mikeash/Makefile b/2005/mikeash/Makefile index 228c5e58e..cb60bd212 100644 --- a/2005/mikeash/Makefile +++ b/2005/mikeash/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/mynx/Makefile b/2005/mynx/Makefile index b8b8b8340..ae9fd0066 100644 --- a/2005/mynx/Makefile +++ b/2005/mynx/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/persano/Makefile b/2005/persano/Makefile index 577d83f79..6aea39660 100644 --- a/2005/persano/Makefile +++ b/2005/persano/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/sykes/Makefile b/2005/sykes/Makefile index 8bffbbffb..e99911dd8 100644 --- a/2005/sykes/Makefile +++ b/2005/sykes/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ pet.rom: ${ROM_DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/timwi/Makefile b/2005/timwi/Makefile index 3e3d3f2e9..f006c53d8 100644 --- a/2005/timwi/Makefile +++ b/2005/timwi/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/toledo/Makefile b/2005/toledo/Makefile index 50a3c4a0c..36521c7f1 100644 --- a/2005/toledo/Makefile +++ b/2005/toledo/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}2 ${PROG}3 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/vik/Makefile b/2005/vik/Makefile index 3d7cb1a75..0cdb11fc0 100644 --- a/2005/vik/Makefile +++ b/2005/vik/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2005/vince/Makefile b/2005/vince/Makefile index 313193420..70fa66242 100644 --- a/2005/vince/Makefile +++ b/2005/vince/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/Makefile b/2006/Makefile index 5c3ffcdb6..bfc925da9 100644 --- a/2006/Makefile +++ b/2006/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2006/birken/Makefile b/2006/birken/Makefile index 180e24278..22e33afaf 100644 --- a/2006/birken/Makefile +++ b/2006/birken/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/borsanyi/Makefile b/2006/borsanyi/Makefile index 9a226a3e9..106767bf7 100644 --- a/2006/borsanyi/Makefile +++ b/2006/borsanyi/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/grothe/Makefile b/2006/grothe/Makefile index 248bfa978..2d148b483 100644 --- a/2006/grothe/Makefile +++ b/2006/grothe/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -144,11 +145,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -156,6 +167,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/hamre/Makefile b/2006/hamre/Makefile index 948de4af3..16e06d705 100644 --- a/2006/hamre/Makefile +++ b/2006/hamre/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/meyer/Makefile b/2006/meyer/Makefile index 3466eaa30..9fe61cd0b 100644 --- a/2006/meyer/Makefile +++ b/2006/meyer/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/monge/Makefile b/2006/monge/Makefile index b0b5bb2d3..aa6fd5d2a 100644 --- a/2006/monge/Makefile +++ b/2006/monge/Makefile @@ -130,7 +130,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/night/Makefile b/2006/night/Makefile index cabf1a01a..5e2019f8b 100644 --- a/2006/night/Makefile +++ b/2006/night/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/sloane/Makefile b/2006/sloane/Makefile index bfcf188a5..8d772799f 100644 --- a/2006/sloane/Makefile +++ b/2006/sloane/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/stewart/Makefile b/2006/stewart/Makefile index 0dc24e349..1e0c73715 100644 --- a/2006/stewart/Makefile +++ b/2006/stewart/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/sykes1/Makefile b/2006/sykes1/Makefile index b3ac7a5bf..a41c6644f 100644 --- a/2006/sykes1/Makefile +++ b/2006/sykes1/Makefile @@ -128,7 +128,8 @@ CFLAGS+= -funroll-loops all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/sykes2/Makefile b/2006/sykes2/Makefile index fdd7fc804..fed474bbf 100644 --- a/2006/sykes2/Makefile +++ b/2006/sykes2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/toledo1/Makefile b/2006/toledo1/Makefile index 2bc8127f1..05b0ab31b 100644 --- a/2006/toledo1/Makefile +++ b/2006/toledo1/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/toledo2/Makefile b/2006/toledo2/Makefile index a9d09fa37..d6fe80de5 100644 --- a/2006/toledo2/Makefile +++ b/2006/toledo2/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2006/toledo3/Makefile b/2006/toledo3/Makefile index 487a7560e..7dc18deb7 100644 --- a/2006/toledo3/Makefile +++ b/2006/toledo3/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -157,11 +158,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -169,6 +180,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/Makefile b/2011/Makefile index 4efbff90e..ccda5edb7 100644 --- a/2011/Makefile +++ b/2011/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2011/akari/Makefile b/2011/akari/Makefile index d06b08d64..d7940dd5a 100644 --- a/2011/akari/Makefile +++ b/2011/akari/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -169,11 +170,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -181,6 +192,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/blakely/Makefile b/2011/blakely/Makefile index cc7fc4581..27d815888 100644 --- a/2011/blakely/Makefile +++ b/2011/blakely/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/borsanyi/Makefile b/2011/borsanyi/Makefile index b17e4ad79..8298b0c8b 100644 --- a/2011/borsanyi/Makefile +++ b/2011/borsanyi/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/dlowe/Makefile b/2011/dlowe/Makefile index 591bb7a93..eb4b9fbd6 100644 --- a/2011/dlowe/Makefile +++ b/2011/dlowe/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/eastman/Makefile b/2011/eastman/Makefile index 2e2b310c9..5df6f3a4a 100644 --- a/2011/eastman/Makefile +++ b/2011/eastman/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/fredriksson/Makefile b/2011/fredriksson/Makefile index 87df4803a..b3efa41ac 100644 --- a/2011/fredriksson/Makefile +++ b/2011/fredriksson/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/goren/Makefile b/2011/goren/Makefile index 9d15fc6ef..f4dd1c3a9 100644 --- a/2011/goren/Makefile +++ b/2011/goren/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/hamaji/Makefile b/2011/hamaji/Makefile index 3a1c32f19..cc42ffd65 100644 --- a/2011/hamaji/Makefile +++ b/2011/hamaji/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/hou/Makefile b/2011/hou/Makefile index 667a06b70..dcdf49a3a 100644 --- a/2011/hou/Makefile +++ b/2011/hou/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/konno/Makefile b/2011/konno/Makefile index e7bfa9a72..375cc046a 100644 --- a/2011/konno/Makefile +++ b/2011/konno/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/richards/Makefile b/2011/richards/Makefile index 034cb39bf..9312d7aed 100644 --- a/2011/richards/Makefile +++ b/2011/richards/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/toledo/Makefile b/2011/toledo/Makefile index 1342703c0..6894b72a1 100644 --- a/2011/toledo/Makefile +++ b/2011/toledo/Makefile @@ -131,7 +131,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/vik/Makefile b/2011/vik/Makefile index 1e0474f79..3c4808dc9 100644 --- a/2011/vik/Makefile +++ b/2011/vik/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2011/zucker/Makefile b/2011/zucker/Makefile index 85df2f047..d5ac89d82 100644 --- a/2011/zucker/Makefile +++ b/2011/zucker/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/Makefile b/2012/Makefile index 225bfc9e1..059af0c0a 100644 --- a/2012/Makefile +++ b/2012/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2012/blakely/Makefile b/2012/blakely/Makefile index a4029dd3b..c50381fb0 100644 --- a/2012/blakely/Makefile +++ b/2012/blakely/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/deckmyn/Makefile b/2012/deckmyn/Makefile index fc43fa00b..fbd77669b 100644 --- a/2012/deckmyn/Makefile +++ b/2012/deckmyn/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/dlowe/Makefile b/2012/dlowe/Makefile index 5547a737f..3a9077bb8 100644 --- a/2012/dlowe/Makefile +++ b/2012/dlowe/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/endoh1/Makefile b/2012/endoh1/Makefile index ef59f8a79..9f1c3d878 100644 --- a/2012/endoh1/Makefile +++ b/2012/endoh1/Makefile @@ -138,7 +138,8 @@ V=8 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -166,11 +167,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -178,6 +189,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/endoh2/Makefile b/2012/endoh2/Makefile index 779907efd..91b03fb45 100644 --- a/2012/endoh2/Makefile +++ b/2012/endoh2/Makefile @@ -134,7 +134,8 @@ ALT_C= pi.c 314.c 3141.c 31415.c 314159.c 3141592.c \ all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -305,11 +306,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -317,6 +328,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/grothe/Makefile b/2012/grothe/Makefile index 0054c89d9..de82c3875 100644 --- a/2012/grothe/Makefile +++ b/2012/grothe/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/hamano/Makefile b/2012/hamano/Makefile index 293c0e908..03192d6cc 100644 --- a/2012/hamano/Makefile +++ b/2012/hamano/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/hou/Makefile b/2012/hou/Makefile index cf660d9cf..b3ba456ba 100644 --- a/2012/hou/Makefile +++ b/2012/hou/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/kang/Makefile b/2012/kang/Makefile index a1c1898ee..2dcf4b24e 100644 --- a/2012/kang/Makefile +++ b/2012/kang/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/konno/Makefile b/2012/konno/Makefile index e2b53df2e..be4d5d8ac 100644 --- a/2012/konno/Makefile +++ b/2012/konno/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/omoikane/Makefile b/2012/omoikane/Makefile index 101d29199..4ec9733b8 100644 --- a/2012/omoikane/Makefile +++ b/2012/omoikane/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/tromp/Makefile b/2012/tromp/Makefile index 3a53631e9..85a0c318f 100644 --- a/2012/tromp/Makefile +++ b/2012/tromp/Makefile @@ -129,7 +129,8 @@ ALT_TARGET= ${ENTRY}32 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -158,11 +159,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -170,6 +181,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/vik/Makefile b/2012/vik/Makefile index 1d19094f3..449ee3cda 100644 --- a/2012/vik/Makefile +++ b/2012/vik/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2012/zeitak/Makefile b/2012/zeitak/Makefile index 230b653b2..4e77f160e 100644 --- a/2012/zeitak/Makefile +++ b/2012/zeitak/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/Makefile b/2013/Makefile index df173a150..449eb0398 100644 --- a/2013/Makefile +++ b/2013/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2013/birken/Makefile b/2013/birken/Makefile index 631249535..20d313f2e 100644 --- a/2013/birken/Makefile +++ b/2013/birken/Makefile @@ -131,7 +131,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -154,11 +155,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -166,6 +177,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/cable1/Makefile b/2013/cable1/Makefile index d3d9830e9..10c18aa13 100644 --- a/2013/cable1/Makefile +++ b/2013/cable1/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/cable2/Makefile b/2013/cable2/Makefile index d91a48c5c..eb8420bb9 100644 --- a/2013/cable2/Makefile +++ b/2013/cable2/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/cable3/Makefile b/2013/cable3/Makefile index 35ef0fcd7..cc4f24f83 100644 --- a/2013/cable3/Makefile +++ b/2013/cable3/Makefile @@ -134,7 +134,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -159,11 +160,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -171,6 +182,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/dlowe/Makefile b/2013/dlowe/Makefile index 0f25e5eed..70adf5672 100644 --- a/2013/dlowe/Makefile +++ b/2013/dlowe/Makefile @@ -122,7 +122,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/endoh1/Makefile b/2013/endoh1/Makefile index f675177d8..15f24f066 100644 --- a/2013/endoh1/Makefile +++ b/2013/endoh1/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -160,11 +161,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -172,6 +183,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/endoh2/Makefile b/2013/endoh2/Makefile index 6b6c3d375..dd2539312 100644 --- a/2013/endoh2/Makefile +++ b/2013/endoh2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -187,11 +188,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -199,6 +210,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/endoh3/Makefile b/2013/endoh3/Makefile index 2a01a3cf3..3cedd31b5 100644 --- a/2013/endoh3/Makefile +++ b/2013/endoh3/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/endoh4/Makefile b/2013/endoh4/Makefile index 8abe1d8ea..dffd95a72 100644 --- a/2013/endoh4/Makefile +++ b/2013/endoh4/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/hou/Makefile b/2013/hou/Makefile index 1f2caa59f..eba8cd27f 100644 --- a/2013/hou/Makefile +++ b/2013/hou/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/mills/Makefile b/2013/mills/Makefile index cc515f18f..55dbe0744 100644 --- a/2013/mills/Makefile +++ b/2013/mills/Makefile @@ -131,7 +131,8 @@ CFLAGS += -ffast-math all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/misaka/Makefile b/2013/misaka/Makefile index 7ec4af006..a3b638ce5 100644 --- a/2013/misaka/Makefile +++ b/2013/misaka/Makefile @@ -131,7 +131,8 @@ OTHER_C= misaka2.c misaka3.c misaka4.c misaka5.c \ all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -221,11 +222,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -233,6 +244,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/morgan1/Makefile b/2013/morgan1/Makefile index 03bc644b7..75d894891 100644 --- a/2013/morgan1/Makefile +++ b/2013/morgan1/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/morgan2/Makefile b/2013/morgan2/Makefile index db42c58db..c490a406a 100644 --- a/2013/morgan2/Makefile +++ b/2013/morgan2/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2013/robison/Makefile b/2013/robison/Makefile index 24be192dc..af217d9be 100644 --- a/2013/robison/Makefile +++ b/2013/robison/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/Makefile b/2014/Makefile index 9b4ef762d..291c26133 100644 --- a/2014/Makefile +++ b/2014/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2014/birken/Makefile b/2014/birken/Makefile index eb786e5c3..e8d8f004e 100644 --- a/2014/birken/Makefile +++ b/2014/birken/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/deak/Makefile b/2014/deak/Makefile index 70ae78383..07897545e 100644 --- a/2014/deak/Makefile +++ b/2014/deak/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/endoh1/Makefile b/2014/endoh1/Makefile index c9ddf7441..6d637889f 100644 --- a/2014/endoh1/Makefile +++ b/2014/endoh1/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -164,11 +165,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -176,6 +187,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/endoh2/Makefile b/2014/endoh2/Makefile index c5f0a77b8..b797926fa 100644 --- a/2014/endoh2/Makefile +++ b/2014/endoh2/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/maffiodo1/Makefile b/2014/maffiodo1/Makefile index cc4ae6cd1..9e92ac8bb 100644 --- a/2014/maffiodo1/Makefile +++ b/2014/maffiodo1/Makefile @@ -131,7 +131,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/maffiodo2/Makefile b/2014/maffiodo2/Makefile index 4d30cfe42..46cfda809 100644 --- a/2014/maffiodo2/Makefile +++ b/2014/maffiodo2/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/morgan/Makefile b/2014/morgan/Makefile index 80704ea47..219421a54 100644 --- a/2014/morgan/Makefile +++ b/2014/morgan/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/sinon/Makefile b/2014/sinon/Makefile index fd0c5c889..bb7f6716f 100644 --- a/2014/sinon/Makefile +++ b/2014/sinon/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/skeggs/Makefile b/2014/skeggs/Makefile index 87cd17361..855042edd 100644 --- a/2014/skeggs/Makefile +++ b/2014/skeggs/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/vik/Makefile b/2014/vik/Makefile index 32a3e3c18..53f3251d2 100644 --- a/2014/vik/Makefile +++ b/2014/vik/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2014/wiedijk/Makefile b/2014/wiedijk/Makefile index 36b4a8852..32de8ba14 100644 --- a/2014/wiedijk/Makefile +++ b/2014/wiedijk/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/Makefile b/2015/Makefile index 6c814ea06..0d74b4a0e 100644 --- a/2015/Makefile +++ b/2015/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2015/burton/Makefile b/2015/burton/Makefile index f0d33dca1..d43236f92 100644 --- a/2015/burton/Makefile +++ b/2015/burton/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/dogon/Makefile b/2015/dogon/Makefile index 0f05beba7..a769a0527 100644 --- a/2015/dogon/Makefile +++ b/2015/dogon/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/duble/Makefile b/2015/duble/Makefile index 4c5c817ce..515866b35 100644 --- a/2015/duble/Makefile +++ b/2015/duble/Makefile @@ -128,7 +128,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/endoh1/Makefile b/2015/endoh1/Makefile index 5c17f6420..ec36e9ff2 100644 --- a/2015/endoh1/Makefile +++ b/2015/endoh1/Makefile @@ -141,7 +141,8 @@ OREGONATOR_MODEL = -Delta_u="Du*laplacian(u)+(u-u*u-F*v*(u-Q)/(u+Q))/E" \ all: ${TARGET} ${DATA} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -212,11 +213,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -224,6 +235,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/endoh2/Makefile b/2015/endoh2/Makefile index 0ac3c9d1c..47e95fff8 100644 --- a/2015/endoh2/Makefile +++ b/2015/endoh2/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/endoh3/Makefile b/2015/endoh3/Makefile index 4d7813b14..a9c9ebbb8 100644 --- a/2015/endoh3/Makefile +++ b/2015/endoh3/Makefile @@ -126,7 +126,8 @@ BACK_TO= mullender.c all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/endoh4/Makefile b/2015/endoh4/Makefile index e89f4ebc0..67b24349f 100644 --- a/2015/endoh4/Makefile +++ b/2015/endoh4/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/hou/Makefile b/2015/hou/Makefile index 4746c9357..18c2c6734 100644 --- a/2015/hou/Makefile +++ b/2015/hou/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/howe/Makefile b/2015/howe/Makefile index 95386a413..8c03fce26 100644 --- a/2015/howe/Makefile +++ b/2015/howe/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -156,11 +157,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -168,6 +179,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/mills1/Makefile b/2015/mills1/Makefile index cb59c3ced..2482a109d 100644 --- a/2015/mills1/Makefile +++ b/2015/mills1/Makefile @@ -286,7 +286,8 @@ endif all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -308,11 +309,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -320,6 +331,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/mills2/Makefile b/2015/mills2/Makefile index 9b8c4c68b..83daeb438 100644 --- a/2015/mills2/Makefile +++ b/2015/mills2/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/muth/Makefile b/2015/muth/Makefile index 96020bb24..5c61f255d 100644 --- a/2015/muth/Makefile +++ b/2015/muth/Makefile @@ -133,7 +133,8 @@ TAPE_SET= tape_15_50.h tape_77_55.h tape_empty.h tape_five.h all: data ${TARGET} ${MACHINE_SET} ${TAPE_SET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -163,11 +164,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -175,6 +186,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/schweikhardt/Makefile b/2015/schweikhardt/Makefile index 0011cf4d3..07256a2e0 100644 --- a/2015/schweikhardt/Makefile +++ b/2015/schweikhardt/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2015/yang/Makefile b/2015/yang/Makefile index 80cd20a42..003ddffb8 100644 --- a/2015/yang/Makefile +++ b/2015/yang/Makefile @@ -133,7 +133,8 @@ MAY_NEED_GPLUSPLUS= g++ all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -174,11 +175,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -186,6 +197,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/Makefile b/2018/Makefile index 0363f0f72..bbb56f8bd 100644 --- a/2018/Makefile +++ b/2018/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2018/algmyr/Makefile b/2018/algmyr/Makefile index 4d0c8986d..fcf457aa4 100644 --- a/2018/algmyr/Makefile +++ b/2018/algmyr/Makefile @@ -127,7 +127,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/anderson/Makefile b/2018/anderson/Makefile index dc896d941..7aed7c8a4 100644 --- a/2018/anderson/Makefile +++ b/2018/anderson/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -149,11 +150,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -161,6 +172,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/bellard/Makefile b/2018/bellard/Makefile index f3d62f141..0df9e3ac7 100644 --- a/2018/bellard/Makefile +++ b/2018/bellard/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/burton1/Makefile b/2018/burton1/Makefile index a2b65d621..3cbfb603e 100644 --- a/2018/burton1/Makefile +++ b/2018/burton1/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -150,11 +151,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -162,6 +173,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/burton2/Makefile b/2018/burton2/Makefile index bd9300fcb..188845258 100644 --- a/2018/burton2/Makefile +++ b/2018/burton2/Makefile @@ -141,7 +141,8 @@ CFLAGS+= -trigraphs all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -182,11 +183,21 @@ test: prog tac runtest fixed_iocccsize ${EXTRA_DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -194,6 +205,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/ciura/Makefile b/2018/ciura/Makefile index e2fd3ceef..b0a962339 100644 --- a/2018/ciura/Makefile +++ b/2018/ciura/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/endoh1/Makefile b/2018/endoh1/Makefile index 639125f5f..c5d4e879a 100644 --- a/2018/endoh1/Makefile +++ b/2018/endoh1/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/endoh2/Makefile b/2018/endoh2/Makefile index 5168ce482..efddc093f 100644 --- a/2018/endoh2/Makefile +++ b/2018/endoh2/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -169,11 +170,21 @@ python3: ${PROG} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -181,6 +192,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/ferguson/Makefile b/2018/ferguson/Makefile index 11ace20ff..32389b940 100644 --- a/2018/ferguson/Makefile +++ b/2018/ferguson/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt weasel.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -157,11 +158,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -169,6 +180,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/giles/Makefile b/2018/giles/Makefile index 20562366f..3983ef0a0 100644 --- a/2018/giles/Makefile +++ b/2018/giles/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/hou/Makefile b/2018/hou/Makefile index e98985db4..2fbc66293 100644 --- a/2018/hou/Makefile +++ b/2018/hou/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/mills/Makefile b/2018/mills/Makefile index 745d94baa..a66fd04c3 100644 --- a/2018/mills/Makefile +++ b/2018/mills/Makefile @@ -134,7 +134,8 @@ V6_TAPE_URL= https://www.tuhs.org/Archive/Distributions/Research/Ken_Wellsch_v6/ all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -203,11 +204,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -215,6 +226,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/poikola/Makefile b/2018/poikola/Makefile index a1dc743f4..8e44bf764 100644 --- a/2018/poikola/Makefile +++ b/2018/poikola/Makefile @@ -127,7 +127,8 @@ DOCS= poikola.tex all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -153,11 +154,21 @@ docs: ${DOCS} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -165,6 +176,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/vokes/Makefile b/2018/vokes/Makefile index 76a6cf9dc..c7796d514 100644 --- a/2018/vokes/Makefile +++ b/2018/vokes/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2018/yang/Makefile b/2018/yang/Makefile index 959fcae9f..7c5cdd524 100644 --- a/2018/yang/Makefile +++ b/2018/yang/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -266,11 +267,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -278,6 +289,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/Makefile b/2019/Makefile index 05c4757b0..d1d10052f 100644 --- a/2019/Makefile +++ b/2019/Makefile @@ -61,7 +61,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -107,6 +108,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -121,6 +127,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -135,6 +155,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2019/adamovsky/Makefile b/2019/adamovsky/Makefile index b8247b065..8589221fb 100644 --- a/2019/adamovsky/Makefile +++ b/2019/adamovsky/Makefile @@ -130,7 +130,8 @@ CFLAGS+= -trigraphs all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -165,11 +166,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -177,6 +188,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/burton/Makefile b/2019/burton/Makefile index 812c80825..4d943036b 100644 --- a/2019/burton/Makefile +++ b/2019/burton/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -160,11 +161,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -172,6 +183,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/ciura/Makefile b/2019/ciura/Makefile index c19dced1a..c6a4cab04 100644 --- a/2019/ciura/Makefile +++ b/2019/ciura/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG} all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/diels-grabsch1/Makefile b/2019/diels-grabsch1/Makefile index 8f1dc63b1..727d8abd5 100644 --- a/2019/diels-grabsch1/Makefile +++ b/2019/diels-grabsch1/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/diels-grabsch2/Makefile b/2019/diels-grabsch2/Makefile index 1dc76fee2..f7e71cfb9 100644 --- a/2019/diels-grabsch2/Makefile +++ b/2019/diels-grabsch2/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/dogon/Makefile b/2019/dogon/Makefile index ab1634642..ced4c9577 100644 --- a/2019/dogon/Makefile +++ b/2019/dogon/Makefile @@ -132,7 +132,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -157,11 +158,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -169,6 +180,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/duble/Makefile b/2019/duble/Makefile index 4b9a0ad55..c849950c8 100644 --- a/2019/duble/Makefile +++ b/2019/duble/Makefile @@ -133,7 +133,8 @@ OS_SET= Linux FreeBSD Darwin all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -228,11 +229,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -240,6 +251,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/endoh/Makefile b/2019/endoh/Makefile index f822cdb9a..1b4a3c92e 100644 --- a/2019/endoh/Makefile +++ b/2019/endoh/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/giles/Makefile b/2019/giles/Makefile index ed1dfd025..0b3a62484 100644 --- a/2019/giles/Makefile +++ b/2019/giles/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/karns/Makefile b/2019/karns/Makefile index b38a122b9..eafbeb2ca 100644 --- a/2019/karns/Makefile +++ b/2019/karns/Makefile @@ -132,7 +132,8 @@ COPT+= -O0 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -159,11 +160,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -171,6 +182,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/lynn/Makefile b/2019/lynn/Makefile index b01e2ec7f..b8d7a8bfc 100644 --- a/2019/lynn/Makefile +++ b/2019/lynn/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/mills/Makefile b/2019/mills/Makefile index 5aaab9bf6..24480f300 100644 --- a/2019/mills/Makefile +++ b/2019/mills/Makefile @@ -283,7 +283,8 @@ prog = ${rnn1} all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -328,11 +329,21 @@ Eugene_Onegin.output.txt: Eugene_Onegin.cp11_1.188 ${generator} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -340,6 +351,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/poikola/Makefile b/2019/poikola/Makefile index 62e9d0679..a9573efe0 100644 --- a/2019/poikola/Makefile +++ b/2019/poikola/Makefile @@ -127,7 +127,8 @@ DOCS= poikola.tex all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -152,11 +153,21 @@ docs: ${DOCS} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -164,6 +175,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2019/yang/Makefile b/2019/yang/Makefile index 935c4b9f9..53e5b1bfe 100644 --- a/2019/yang/Makefile +++ b/2019/yang/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/Makefile b/2020/Makefile index 390198ddb..38fc38a05 100644 --- a/2020/Makefile +++ b/2020/Makefile @@ -62,7 +62,8 @@ all: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -108,6 +109,11 @@ everything: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -122,6 +128,20 @@ diff_orig_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + # diff alt source and source # diff_alt_prog: @@ -136,6 +156,46 @@ diff_alt_prog: done @echo '=-=-= ${YEAR} complete make $@ =-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + +diff_alt_orig: + @echo '=-=-= ${YEAR} begin make $@ =-=-=' + @echo + @for i in ${WINNERS} ; do \ + echo "=-= start ${YEAR}/$$i =-="; \ + echo "(cd $$i && $(MAKE) $@)"; \ + (cd $$i && $(MAKE) $@); \ + echo "=-= end ${YEAR}/$$i =-="; \ + echo; \ + done + @echo '=-=-= ${YEAR} complete make $@ =-=-=' + ############### # utility rules diff --git a/2020/burton/Makefile b/2020/burton/Makefile index b00d26ae3..be2f44d45 100644 --- a/2020/burton/Makefile +++ b/2020/burton/Makefile @@ -136,7 +136,8 @@ _S=0 all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -169,11 +170,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -181,6 +192,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/carlini/Makefile b/2020/carlini/Makefile index a9e4f258b..ad142002d 100644 --- a/2020/carlini/Makefile +++ b/2020/carlini/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -145,11 +146,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -157,6 +168,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/endoh1/Makefile b/2020/endoh1/Makefile index 213fe6f53..53e767655 100644 --- a/2020/endoh1/Makefile +++ b/2020/endoh1/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/endoh2/Makefile b/2020/endoh2/Makefile index 315e2a0bc..27a4f30e3 100644 --- a/2020/endoh2/Makefile +++ b/2020/endoh2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/endoh3/Makefile b/2020/endoh3/Makefile index 77f28470f..b8291f4e6 100644 --- a/2020/endoh3/Makefile +++ b/2020/endoh3/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -155,11 +156,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -167,6 +178,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/ferguson1/Makefile b/2020/ferguson1/Makefile index a37f3b315..d029b49c3 100644 --- a/2020/ferguson1/Makefile +++ b/2020/ferguson1/Makefile @@ -132,7 +132,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -179,11 +180,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -191,6 +202,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/ferguson2/Makefile b/2020/ferguson2/Makefile index e8adea9ba..49a36c59e 100644 --- a/2020/ferguson2/Makefile +++ b/2020/ferguson2/Makefile @@ -126,7 +126,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/giles/Makefile b/2020/giles/Makefile index 1f877aa1c..3648cf155 100644 --- a/2020/giles/Makefile +++ b/2020/giles/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/kurdyukov1/Makefile b/2020/kurdyukov1/Makefile index b9318a695..a0cac2990 100644 --- a/2020/kurdyukov1/Makefile +++ b/2020/kurdyukov1/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -148,11 +149,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -160,6 +171,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/kurdyukov2/Makefile b/2020/kurdyukov2/Makefile index 03b371284..a0f189057 100644 --- a/2020/kurdyukov2/Makefile +++ b/2020/kurdyukov2/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -156,11 +157,21 @@ data: ${DATA} everything: all alt + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -168,6 +179,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules ############### diff --git a/2020/kurdyukov3/Makefile b/2020/kurdyukov3/Makefile index 5bff00845..d26cbddf3 100644 --- a/2020/kurdyukov3/Makefile +++ b/2020/kurdyukov3/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= ${PROG}.alt ${PROG}.extra all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/kurdyukov4/Makefile b/2020/kurdyukov4/Makefile index e45230179..5b5200eaa 100644 --- a/2020/kurdyukov4/Makefile +++ b/2020/kurdyukov4/Makefile @@ -123,7 +123,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -151,11 +152,21 @@ ${DATA}: everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -163,6 +174,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/otterness/Makefile b/2020/otterness/Makefile index 218150312..31a8e70df 100644 --- a/2020/otterness/Makefile +++ b/2020/otterness/Makefile @@ -124,7 +124,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -146,11 +147,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -158,6 +169,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/tsoj/Makefile b/2020/tsoj/Makefile index 9398c4a17..9e89db2e7 100644 --- a/2020/tsoj/Makefile +++ b/2020/tsoj/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/2020/yang/Makefile b/2020/yang/Makefile index ed1bd6b6f..1ccda20ba 100644 --- a/2020/yang/Makefile +++ b/2020/yang/Makefile @@ -125,7 +125,8 @@ ALT_TARGET= all: data ${TARGET} @${TRUE} -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -147,11 +148,21 @@ data: ${DATA} everything: all alt @${TRUE} + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: ${PROG}.orig.c ${PROG}.c @-${DIFF} -u ${PROG}.orig.c ${PROG}.c +# diff source and orig source +# +diff_prog_orig: ${PROG}.c ${PROG}.orig.c + @-${DIFF} -u ${PROG}.c ${PROG}.orig.c + # diff alt source and source # diff_alt_prog: ${PROG}.c @@ -159,6 +170,25 @@ diff_alt_prog: ${PROG}.c ${DIFF} -u ${PROG}.alt.c ${PROG}.c; \ fi +# diff source and alt source +# +diff_prog_alt: ${PROG}.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.c ${PROG}.alt.c; \ + fi + +# diff orig and alt +# +diff_orig_alt: ${PROG}.orig.c + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.orig.c ${PROG}.alt.c; \ + fi + +diff_alt_orig: + @-if [[ -e ${PROG}.alt.c ]]; then \ + ${DIFF} -u ${PROG}.alt.c ${PROG}.orig.c; \ + fi + ############### # utility rules diff --git a/Makefile b/Makefile index 466c57e59..8d16fa5fb 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,8 @@ all: done @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' -.PHONY: all alt data everything diff_orig_prog diff_alt_prog \ +.PHONY: all alt data everything diff_orig_prog diff_prog_orig \ + diff_alt_prog diff_prog_alt diff_orig_alt diff_alt_orig \ clean clobber install love haste waste maker easter_egg \ sandwich supernova deep_magic magic charon pluto @@ -91,6 +92,11 @@ everything: done @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' + +##################### +# make a difference # +##################### +# # diff orig source and source # diff_orig_prog: @@ -103,6 +109,18 @@ diff_orig_prog: done @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' +# diff source and orig source +# +diff_prog_orig: + @echo '=-=-=-=-= IOCCC begin make $@ =-=-=-=-=' + @-for i in [12][0-9][0-9][0-9]; do \ + if [ -f $$i/Makefile ]; then \ + echo "cd $$i; make $@"; \ + (cd $$i; make $@); \ + fi; \ + done + @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' + # diff alt source and source # diff_alt_prog: @@ -115,6 +133,40 @@ diff_alt_prog: done @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' +# diff source and alt source +# +diff_prog_alt: + @echo '=-=-=-=-= IOCCC begin make $@ =-=-=-=-=' + @-for i in [12][0-9][0-9][0-9]; do \ + if [ -f $$i/Makefile ]; then \ + echo "cd $$i; make $@"; \ + (cd $$i; make $@); \ + fi; \ + done + @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' + +# diff orig and alt +# +diff_orig_alt: + @echo '=-=-=-=-= IOCCC begin make $@ =-=-=-=-=' + @-for i in [12][0-9][0-9][0-9]; do \ + if [ -f $$i/Makefile ]; then \ + echo "cd $$i; make $@"; \ + (cd $$i; make $@); \ + fi; \ + done + @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' + +diff_alt_orig: + @echo '=-=-=-=-= IOCCC begin make $@ =-=-=-=-=' + @-for i in [12][0-9][0-9][0-9]; do \ + if [ -f $$i/Makefile ]; then \ + echo "cd $$i; make $@"; \ + (cd $$i; make $@); \ + fi; \ + done + @echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-=' + ############### # utility rules