fix Makefile and README.md for 2020/endoh3

2020/endoh3/.gitignore

@@ -1,4 +1,4 @@
 clock
 clock.c
 prog
-run_clock
+prog.alt

2020/endoh3/Makefile

@@ -1,14 +1,41 @@
 #!/usr/bin/env make
 #
-# 2020 makefile
+# IOCCC 2020 winning entry - endoh3
+
+################################################################################
 #
-# This work by Landon Curt Noll, Simon Cooper, and Leonid A. Broukhis
+# Regarding individual entries:
-# is licensed under:
+#
+# IOCCC winning entry code may not work on your system.  Even with standards,
+# conditions and build environments change, especially when it comes to more
+# extreme code such you might find in an IOCCC winner.  Moreover, what was
+# allowed and liked in one IOCCC contest may no longer be liked/allowed in
+# later IOCCC years.
+#
+# Corrections on winning author and fixing typos in remarks are VERY WELCOME.
+#
+# GitHub pull requests are welcome:
+#
+# If you have a patch that might make running an entry work in modern Unix-like
+# environments, please create a GitHub pull request for the IOCCC judges to
+# consider.
+#
+# Suggestions and corrections regarding Makefiles, winning author information,
+# fixing typos in remarks, and code patches are welcome via opening a GitHub
+# issue or better yet, by creating a GitHub pull request for the IOCCC judges
+# to consider.  To form a GitHub issue or GitHub pull, please visit:
+#
+# https://github.com/ioccc-src/winner
+#
+################################################################################
+
+# This work by Landon Curt Noll and Leonid A. Broukhis is licensed under:
 #
 #	Creative Commons Attribution-ShareAlike 3.0 Unported License.
 #
 # See: http://creativecommons.org/licenses/by-sa/3.0/
 
+
 #############################
 # shell used by this Makefile
 #############################
@@ -19,264 +46,7 @@ SHELL= bash
 # common tool locations
 #######################
 #
-A2P= a2p
+include ../../var.mk
-AR= ar
-ASA= asa
-AT= at
-ATQ= atq
-ATRM= atrm
-AWK= awk
-BANNER= banner
-BASE64= base64
-BASENAME= basename
-BATCH= batch
-BC= bc
-BINHEX= binhex
-BISON= bison
-BUNZIP2= bunzip2
-BZCAT= bzcat
-BZCMP= bzcmp
-BZDIFF= bzdiff
-BZEGREP= bzegrep
-BZFGREP= bzfgrep
-BZGREP= bzgrep
-BZIP2= bzip2
-BZLESS= bzless
-BZMORE= bzmore
-C2PH= c2ph
-C89= c89
-C99= c99
-CAL= cal
-CALC= calc
-CAT= cat
-CD= cd
-CHFLAGS= chflags
-CHGRP= chgrp
-CHMOD= chmod
-CKSUM= cksum
-CLANG= clang
-CLANG_PLUSPLUS= clang++
-CLEAR= clear
-CMP= cmp
-COL= col
-COLLDEF= colldef
-COLRM= colrm
-COLUMN= column
-COMPRESS= compress
-CP= cp
-CPIO= cpio
-CPP= cpp
-CRC32= crc32
-CSH= csh
-CSPLIT= csplit
-CURL= curl
-CUT= cut
-C_PLUSPLUS= c++
-C_PLUSPLUS_FILT= c++filt
-DATE= date
-DC= dc
-DD= dd
-DF= df
-DIFF3= diff3
-DIFF= diff
-DIG= dig
-DIRNAME= dirname
-ED= ed
-EGREP= egrep
-ENV= env
-EQN= eqn
-ETAGS= etags
-EXPECT= expect
-EXPR= expr
-FALSE= false
-FGREP= fgrep
-FILE= file
-FIND2PERL= find2perl
-FIND= find
-FLEX= flex
-FLEX_PLUSPLUS= flex++
-FMT= fmt
-FOLD= fold
-FS_USAGE= fs_usage
-FUNZIP= funzip
-FUSER= fuser
-GCC= gcc
-GDIFFMK= gdiffmk
-GENCAT= gencat
-GENSTRINGS= genstrings
-GETOPT= getopt
-GETOPTS= getopts
-GINDENT= gindent
-GNUMAKE= gnumake
-GREP= grep
-GROFF= groff
-GROFFER= groffer
-GROG= grog
-GROPS= grops
-GROTTY= grotty
-GUNZIP= gunzip
-GVIM= gvim
-GZCAT= gzcat
-GZEXE= gzexe
-GZIP_PROG= gzip
-G_PLUSPLUS= g++
-H2PH= h2ph
-H2XS= h2xs
-HASH= hash
-HEAD= head
-HOSTNAME_PROG= hostname
-ICONV= iconv
-ID= id
-INDENT= indent
-INFO= info
-JOT= jot
-KILL= kill
-KSH= ksh
-LAST= last
-LD= ld
-LESSECHO= lessecho
-LEX= len
-LINK= link
-LN= ln
-LS= ls
-M4= m4
-MAKE= make
-MAN= man
-MKDIR= mkdir
-MKFIFO= mkfifo
-MKTEMP= mktemp
-MV= mv
-NANO= nano
-NASM= nasm
-NEQN= neqn
-NICE= nice
-NL= nl
-NM= nm
-NOHUP= nohup
-NROFF= nroff
-NSLOOKUP= nslookup
-OD= od
-OPENSSL= openssl
-PASTE= paste
-PATCH= patch
-PATHCHK= pathchk
-PAX= pax
-PERL= perl
-PICO= pico
-PR= pr
-PRINTENV= printenv
-PS= ps
-PTAR= ptar
-PTARDIFF= ptardiff
-PTARGREP= ptargrep
-PWD= pwd
-PYDOC= pydoc
-PYTHON= python
-PYTHONW= pythonw
-READLINK= readlink
-RENICE= renice
-RESET= reset
-REV= rev
-RI= ri
-RM= rm
-RMDIR= rmdir
-RSYNC= rsync
-RUBY= ruby
-RVIM= rvim
-SAY= say
-SCP= scp
-SCREEN= screen
-SCRIPT= script
-SDIFF= sdiff
-SED= sed
-SEQ= seq
-SFTP= sftp
-SH= sh
-SHA1= sha1
-SHA= sha
-SHAR= shar
-SHASUM5_18= shasum5.18
-SHASUM= shasum
-SIZE= size
-SLEEP= sleep
-SORT= sort
-SSH= ssh
-STAT= stat
-STRIP= strip
-STTY= stty
-SUM= sum
-SYNC= sync
-TABS= tabs
-TAIL= tail
-TAR= tar
-TEE= tee
-TEST= test
-TFTP= tftp
-TIDY= tidy
-TIME= time
-TOP= top
-TOUCH= touch
-TPUT= tout
-TPUT= tput
-TR= tr
-TROFF= troff
-TRUE= true
-TSET= tset
-TSORT= tsort
-UL= ul
-UNAME= uname
-UNCOMPRESS= uncompress
-UNEXPAND= unexpand
-UNIFDEF= unifdef
-UNIFDEFALL= unifdefall
-UNIQ= uniq
-UNITS= units
-UNLINK= unlink
-UNZIP= unzip
-UNZIPSFX= unzipsfx
-UPTIME= uptime
-UUDECODE= uudecode
-UUENCODE= uuencode
-UUIDGEN= uuidgen
-VI= vi
-VIEW= view
-VIM= vim
-VIMDIFF= vimdiff
-W= w
-WAIT4PATH= wait4path
-WAIT= wait
-WC= wc
-WHAT= what
-WHATIS= whatis
-WHICH= which
-WHO= who
-WHOAMI= whoami
-WHOIS= whois
-WRTIE= write
-XAR= xar
-XARGS= xargs
-XATTR= xattr
-XXD= xxd
-YACC= yacc
-YES= yes
-ZCAT= zcat
-ZCMP= zcmp
-ZDIFF= zdiff
-ZEGREP= zegrep
-ZFGREP= zfgrep
-ZFORCE= zforce
-ZGREP= zgrep
-ZIP= zip
-ZIPCLOAK= zipcloak
-ZIPGREP= zipgrep
-ZIPINFO= zipinfo
-ZIPNOTE= zipnote
-ZIPSPLIT= zipsplit
-ZLESS= zless
-ZMORE= zmore
-ZNEW= znew
-ZPRINT= zprint
-ZSH= zsh
 
 # Set X11_LIBDIR to the directory where the X11 library resides
 #
@@ -290,62 +60,25 @@ X11_LIBDIR= /opt/X11/lib
 #X11_INCDIR= /usr/X11/include
 X11_INCDIR= /opt/X11/include
 
-# CWARN - Silence warnings that ${CWARN} would normally complain about
+# Common C compiler warnings to silence
-# CSILENCE -Compiler warnings
-#
-ifeq ($(CC),clang)
-
-# clang CSILENCE and CWARN
-#
-#CSILENCE=
-#CSILENCE= -Wno-implicit-int
-CSILENCE= -Wno-date-time -Wno-float-conversion -Wno-implicit-float-conversion -Wno-missing-prototypes \
-	  -Wno-missing-variable-declarations -Wno-redundant-parens -Wno-unknown-warning-option
-#
-#CWARN= $CSILENCE}
-#CWARN= -Wall $CSILENCE}
-#CWARN= -Wall -Wextra $CSILENCE}
-#CWARN= -Wall -Wextra -pedantic ${CSILENCE}
-#CWARN= -Wall -Wextra -Weverything $CSILENCE}
-CWARN= -Wall -Wextra -Weverything -pedantic ${CSILENCE}
-
-else
-ifeq ($(CC),gcc)
-
-# gcc CSILENCE and CWARN
 #
 CSILENCE=
 #CSILENCE= -Wno-implicit-int
+
+# Common C compiler warning flags
 #
-#CWARN= $CSILENCE}
+#CWARN= ${CSILENCE}
-#CWARN= -Wall $CSILENCE}
+#CWARN= -Wall ${CSILENCE}
-#CWARN= -Wall -Wextra $CSILENCE}
+#CWARN= -Wall -Wextra ${CSILENCE}
 CWARN= -Wall -Wextra -pedantic ${CSILENCE}
 
-else
+# Compiler standard
-
-# default CSILENCE and WARN
-#
-CSILENCE=
-#CSILENCE= -Wno-implicit-int
-#
-#CWARN= $CSILENCE}
-#CWARN= -Wall $CSILENCE}
-#CWARN= -Wall -Wextra $CSILENCE}
-CWARN= -Wall -Wextra -pedantic ${CSILENCE}
-#CWARN= -Wall -Wextra -Weverything $CSILENCE}
-#CWARN= -Wall -Wextra -Weverything -pedantic ${CSILENCE}
-
-endif
-endif
-
-# compiler standard
 #
 #CSTD=
 #CSTD= -ansi
-CSTD= -std=c11
+CSTD= -std=gnu17
 
-# compiler bit architecture
+# Compiler bit architecture
 #
 # Some entries require 32-bitness:
 # ARCH= -m32
@@ -357,20 +90,21 @@ CSTD= -std=c11
 #
 ARCH=
 
-# defines that are needed to compile
+# Defines that are needed to compile
 #
 CDEFINE=
 #CDEFINE= -DIOCCC
 
-# include files that are needed to compile
+# Include files that are needed to compile
 #
 CINCLUDE=
 #CINCLUDE= -include stdlib.h
 #CINCLUDE= -include stdio.h
 #CINCLUDE= -include stdlib.h -include stdio.h
 #CINCLUDE= -I ${X11_INCDIR}
+#CINCLUDE= `${SDL2_CONFIG} --cflags`
 
-# optimization
+# Optimization
 #
 # Most compiles will safely use -O2.  Some can use only -O1 or -O.
 # A few compilers have broken optimizers or this entry make break
@@ -383,86 +117,103 @@ CINCLUDE=
 #OPT= -O2
 OPT= -O3
 
-# default flags for ANSI C compilation
+# Default flags for ANSI C compilation
 #
 CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT}
 
 # Libraries needed to build
 #
 LIBS=
-#LIBS= -L ${X11_LIBDIR}
+#LIBS= -lm
+#LIBS= -L ${X11_LIBDIR} -lX11
+#LIBS= `${SDL2_CONFIG} --libs`
 
-# ANSI compiler
+# C compiler to use
-#
-# Set CC to the name of your ANSI compiler.
-#
-# Some entries seem to need gcc.  If you have gcc, set
-# both CC and MAY_NEED_GCC to gcc.
-#
-# If you do not have gcc, set CC to the name of your ANSI compiler, and
-# set MAY_NEED_GCC to either ${CC} (and hope for the best) or to just :
-# to disable such programs.
 #
 CC= cc
-#CC= clang
+#CC=clang
-MAY_NEED_GCC= gcc
+#CC=gcc
+
+# Compiler add-ons or replacements for clang only
+#
+ifeq ($(CC),clang)
+#
+CSILENCE+= -Wno-date-time -Wno-float-conversion -Wno-implicit-float-conversion \
+	-Wno-missing-prototypes -Wno-missing-variable-declarations \
+	-Wno-poison-system-directories -Wno-redundant-parens -Wno-strict-prototypes
+#
+CWARN+= -Weverything
+#
+endif
+
+# Specific add-ons or replacements for gcc only
+#
+ifeq ($(CC),gcc)
+#
+#CSILENCE+=
+#
+#CWARN+=
+#
+endif
 
 
 ##############################
 # Special flags for this entry
 ##############################
 #
-OBJ= prog.o
+ENTRY= endoh3
-DATA=
+PROG= prog
-TARGET= prog clock.c clock run_clock
 #
-ALT_OBJ=
+OBJ= ${PROG}.o
-ALT_TARGET=prog.alt
+DATA=
+TARGET= ${PROG} clock
+#
+ALT_OBJ= ${PROG}.alt.o
+ALT_TARGET= ${PROG}.alt
 
 
 #################
 # build the entry
 #################
 #
-all: ${TARGET} ${DATA}
+all: data ${TARGET}
 	@${TRUE}
 
-prog: prog.c
+.PHONY: all alt data everything clean clobber install \
-	${CC} ${CFLAGS} $< -o $@ ${LIBS}
+	love haste waste maker easter_egg sandwich \
+	supernova deep_magic magic charon pluto
 
-prog.alt: prog.alt.c
+${PROG}: ${PROG}.c
 	${CC} ${CFLAGS} $< -o $@ ${LIBS}
 
-clock.c: prog.c
-	@${RM} -f $@
-	${CP} -f $< $@
-
 clock: clock.c
-	@${RM} -f $@
-	${CC} ${CFLAGS} $< -o $@ ${LIBS}
 
-run_clock: run_clock.sh
+clock.c: ${PROG}.c
 	@${RM} -f $@
 	${CP} -f $< $@
-	${CHMOD} +x $@
 
 # alternative executable
 #
-alt: ${ALT_TARGET}
+alt: data ${ALT_TARGET}
 	@${TRUE}
 
+${PROG}.alt: ${PROG}.alt.c
+	${CC} ${CFLAGS} $< -o $@ ${LIBS}
+
 # data files
 #
 data: ${DATA}
 	@${TRUE}
 
+# both all and alt
+#
+everything: all alt
+
 
 ###############
 # utility rules
 ###############
 #
-everything: all alt
-
 clean:
 	${RM} -f ${OBJ} ${ALT_OBJ}
 	@-if [ -f indent.c ]; then \
@@ -477,24 +228,13 @@ clobber: clean
 	    echo 'ate sandwich'; \
 	fi
 
-nuke: clobber
-	@${TRUE}
-
-dist_clean: nuke
-	@${TRUE}
-
 install:
-	@echo "Surely you are performing, Dr. Science!"
+	@echo "Dr. Spock says that is not logical!"
 	@${TRUE}
 
-# backwards compatibility
+# you may be able to misunderstand the source by reading indent.c
 #
-build: all
+indent.c: ${PROG}.c
-	@${TRUE}
-
-# you may be able to mis-understand the source by reading indent.c
-#
-indent.c: prog.c
 	@if which "${GINDENT}" >/dev/null 2>&1; then \
 	    echo ${RM} -f $@; \
 	    ${RM} -f $@; \
@@ -506,7 +246,7 @@ indent.c: prog.c
 	    echo "${INDENT} < $< > $@"; \
 	    ${INDENT} < $< > $@; \
 	else \
-	    echo "no intent prog found, ident $< yourself, sorry"; \
+	    echo "no intent tool found, ident $< yourself, sorry"; \
 	    echo "exit 1"; \
 	    exit 1; \
 	fi
@@ -528,26 +268,21 @@ waste:
 	@echo 'haste'
 	@${TRUE}
 
-make:
+maker:
-	@echo 'We encourage you to attend a maker faire'
+	@echo 'Participate in a maker faire'
 	@${TRUE}
 
 easter_egg:
-	@echo you expected to often mis-understand this $${RANDOM} magic
+	@echo "you expected to often misunderstand this $${RANDOM} magic"
-	@echo chongo '<was here>' "/\\oo/\\"
+	@echo "chongo '<was here>' /\\oo/\\"
-	@echo Eggy and Kitty
+	@echo "Eggy"
 
-fabricate fashion form frame manufacture produce: make
+sandwich: easter_egg
-	@${TRUE}
-
-sandwich:
 	@if [ `id -u` -eq 0 ]; then \
 	    echo 'Okay.'; \
-	    echo $${RANDOM}`date +%s`$${RANDOM} | \
+	    echo "$${RANDOM}`date +%s`$${RANDOM}" > $@; \
-	      ${SHASUM} -a 512256 | \
-	      ${SED} -e 's/ .*//' > $@; \
 	else \
-	    echo 'Reall?!? Make it yourself.'; \
+	    echo 'What? Make it yourself.'; \
 	    exit 1; \
 	fi
 
@@ -555,47 +290,48 @@ sandwich:
 # as well as the West Coast Computer Faire and
 # you might be confused different.  :-)
 #
-supernova: nuke
+supernova: sandwich
 	@-if [ -r .code_anal ]; then \
 	    ${RM} -f .code_anal_v6; \
 	else \
-	    echo "planet deniers, like a few silly IAU members, are so cute when they try to defend their logic"; \
+	    echo "planet deniers, like some members of the IAU, are so cute when they try to defend their logic"; \
 	fi
-	@echo A $@ helps ${MAKE} the elements that help form planets
+	@echo "A $@ helps ${MAKE} the elements that help form planets"
 	@${TRUE}
 
-deep_magic:
+deep_magic: supernova
 	@-if [ -r .code_anal ]; then \
-	    ccode_analysis --deep_magic 253d8c80830e2df66c018820004b3d4939821bbd7d781fc50d9e633797e44f65d1d62c707bb7e5a82c328a37bbf9ecb4c46fb56aa3f08641fcf45d10ba3c6081 --FNV1a_hash_512_bit "prog"; \
+	    ccode_analysis --deep_magic 7889066cdbdf09b0408021754586e895be641cc9be29e7eafd3ca65359541f17 \
+	    		   --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
 	else \
 	    echo "Wrong! Do it again!"; \
-	    sleep 1; \
+	    sleep 2; \
 	    echo "Wrong! Do it again!"; \
-	    sleep 1; \
+	    sleep 2; \
 	    echo "Wrong! Do it again!"; \
 	fi
 	@${TRUE}
 
 magic: deep_magic
 	@-if [ -r .code_anal ]; then \
-	    ccode_analysis --level 391581 --mode 216193 --state Riesel --FNV1a_hash_512_bit "prog"; \
+	    ccode_analysis --level 20003 --mode 5717175 --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
 	else \
 	    echo "If you don't eat yer meat, you can't have any pudding!"; \
 	    echo "How can you have any pudding if you don't eat yer meat?!"; \
-	    echo "Be careful with that axe, Eugene."; \
 	fi
 	@${TRUE}
 
 # The IOCCC resident astronomer states
 #
-charon: supernova
+charon: magic
-	@echo $@ is a dwarf planet
+	@echo "$@ is a dwarf planet"
-	@echo dwarf is a type of planet
+	@echo "dwarf is a type of planet"
-	@echo therefore we continue to tell the IAU that $@ is a planet
+	@echo "therefore IAU, $@ is a planet"
 
-pluto: supernova
+pluto: charon
 	${MAKE} charon
-	@echo $@ is a dwarf planet
+	@echo "$@ is a dwarf planet"
-	@echo dwarf is a type of planet
+	@echo "dwarf is a type of planet"
-	@echo therefore, $@ is a planet
+	@echo "therefore, $@ is a planet"
-	@echo having lots of planets is good feature because supernovae can help ${MAKE} a lot of them
+	@echo "having lots of planets is good feature because supernovae can help ${MAKE} a lot of them"
+

2020/endoh3/README.md

@@ -1,23 +1,42 @@
 # Most head-turning
 
+```
 Yusuke Endoh  
 Twitter: @mametter  
+```
 
+## To build:
 
-The code for this entry can be found in prog.c
+```sh
+make
+```
 
-## Judges' comments:
+### To run:
-### To use:
 
-    make
+```sh
-    ./prog
+./prog
+```
+
+### Alternate code:
+
+An alternate version of this entry, `prog.alt.c`, is provided.  This alternate code uses Unicode letters.
+
+To compile this alternate version:
+
+```sh
+make alt
+```
+
+Use `prog.alt` as you would `prog` above.
 
 ### Try:
 
-    ./run_clock
+```sh
-    # And watch closely for 15-20 seconds
+./run_clock
+# And watch closely for 15-20 seconds
+```
 
-### Selected Judges Remarks:
+## Judges' comments:
 
 You may be tempted to use a mirror. Resist the temptation! Try figuring out how the clock hands are drawn.
 Can you change the program to make it draw a familiar (non-mirrored) clock face? Can you add the second hand?
@@ -25,20 +44,19 @@ Can you change the program to make it draw a familiar (non-mirrored) clock face?
 When using the `run_clock` shell script, your perception of time might depend on what time it is.
 
 ## Author's comments:
+
 Prepare a mirror!
 
-    $ make clock
+```sh
+make clock
+```
 
 Note: You need to recompile it each run.
 
----
+## Copyright:
 
-prog.alt.c is an alternate version that uses Unicode letters, which was suggested by the judges.
-
------------------------------------------------------------------------------------------------------
 (c) Copyright 1984-2020, [Leo Broukhis, Simon Cooper, Landon Curt Noll][judges] - All rights reserved
 This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License][cc].
 
 [judges]: http://www.ioccc.org/judges.html
 [cc]: http://creativecommons.org/licenses/by-sa/3.0/
------------------------------------------------------------------------------------------------------

2020/endoh3/run_clock.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/end bash
 while true; do
 cc -std=c11 -Wall -Wextra -pedantic -O3 clock.c -o clock
 clear