fix Makefile and README.md for 2013/mills

2013/mills/Makefile

@@ -1,96 +1,163 @@
 #!/usr/bin/env make
 #
-# 2013 makefile
+# IOCCC 2013 winning entry - mills
+
+################################################################################
 #
-# 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/
 
 
-################
+#############################
-# tool locations
+# shell used by this Makefile
-################
+#############################
 #
 SHELL= bash
-CP= cp
+
-CPP= cpp
+#######################
-GUNZIP= gunzip
+# common tool locations
-LD= ld
+#######################
-MAKE= make
+#
-RM= rm
+include ../../var.mk
-SED= sed
-TAR= tar
-TRUE= true
 
 # Set X11_LIBDIR to the directory where the X11 library resides
 #
-X11_LIBDIR= /usr/X11R6/lib
+#X11_LIBDIR= /usr/X11R6/lib
+#X11_LIBDIR= /usr/X11/lib
+X11_LIBDIR= /opt/X11/lib
 
 # Set X11_INCLUDEDIR to the directory where the X11 include files reside
 #
-X11_INCDIR= /usr/X11R6/include
+#X11_INCDIR= /usr/X11R6/include
+#X11_INCDIR= /usr/X11/include
+X11_INCDIR= /opt/X11/include
 
-# Compiler warnings
+# Common C compiler warnings to silence
 #
-#CWARN=
+#CSILENCE=
-CWARN= -Wall
+CSILENCE= -Wno-bitwise-op-parentheses -Wno-parentheses
-#CWARN= -Wall -pedantic
 
-# compiler standard
+# Common C compiler warning flags
+#
+#CWARN= ${CSILENCE}
+#CWARN= -Wall ${CSILENCE}
+#CWARN= -Wall -Wextra ${CSILENCE}
+CWARN= -Wall -Wextra -pedantic ${CSILENCE}
+
+# Compiler standard
 #
 #CSTD=
 #CSTD= -ansi
-CSTD= -std=c99
+CSTD= -std=gnu11
 
-# compiler bit architecture
+# Compiler bit architecture
 #
 # Some entries require 32-bitness:
 # ARCH= -m32
 #
-# Some entries require 64-bitess:
+# Some entries require 64-bitness:
 # ARCH= -m64
 #
 # By default we assume nothing:
 #
 ARCH=
 
-# optimization
+# Defines that are needed to compile
+#
+#CDEFINE=
+CDEFINE= -DLT=0,-9,70,130,50,30,-60,40,30 -DNL=9 -DEY=0,-22,37 \
+	-Dwin_port="sin_addr.s_addr=htonl(2130706433),R.sin_port"
+
+# 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} -I ${X11_INCDIR}/X11
+#CINCLUDE= `${SDL2_CONFIG} --cflags`
+
+# 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
 # under those buggy optimizers and thus you may not want anything.
+# Reasonable compilers will allow for -O3.
 #
 #OPT=
 #OPT= -O
 #OPT= -O1
-OPT= -O2
+#OPT= -O2
-#OPT= -O3
+OPT= -O3
+
+# Default flags for ANSI C compilation
+#
+CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT}
 
 # Libraries needed to build
 #
+#LIBS=
 LIBS= -lm
+#LIBS= -L ${X11_LIBDIR} -lX11
+#LIBS= `${SDL2_CONFIG} --libs`
 
-# default flags for ANSI C compilation
+# C compiler to use
-#
-CFLAGS= ${CWARN} -ffast-math ${CSTD} ${ARCH} ${OPT}
-
-# ANSI compiler
-#
-# 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
-MAY_NEED_GCC= gcc
+#CC=gcc
+
+# Compiler add-ons or replacements for clang only
+#
+ifeq ($(CC),clang)
+#
+CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \
+	-Wno-implicit-float-conversion -Wno-implicit-int-conversion \
+	-Wno-missing-prototypes -Wno-missing-variable-declarations \
+	-Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \
+	-Wno-sign-conversion -Wno-strict-prototypes
+#
+CWARN+= -Weverything
+#
+endif
+
+# Specific add-ons or replacements for gcc only
+#
+ifeq ($(CC),gcc)
+#
+#CSILENCE+=
+#
+#CWARN+=
+#
+endif
 
 
 ##############################
@@ -98,24 +165,37 @@ MAY_NEED_GCC= gcc
 ##############################
 #
 ENTRY= mills
+PROG= ${ENTRY}
+#
+OBJ= ${PROG}.o
 DATA=
+TARGET= ${PROG}
+#
 ALT_OBJ=
-ALT_ENTRY=
+ALT_TARGET=
+
+# This entry suggests using -ffast-math
+#
+CFLAGS += -ffast-math
 
 
 #################
 # build the entry
 #################
 #
-all: ${ENTRY} ${DATA}
+all: data ${TARGET}
 	@${TRUE}
 
-${ENTRY}: ${ENTRY}.c
+.PHONY: all alt data everything clean clobber install \
-	${CC} ${CFLAGS} -DLT=0,-9,70,130,50,30,-60,40,30 -DNL=9 -DEY=0,-22,37 -Dwin_port="sin_addr.s_addr=htonl(2130706433),R.sin_port" $< -o $@ ${LIBS}
+	love haste waste maker easter_egg sandwich \
+	supernova deep_magic magic charon pluto
+
+${PROG}: ${PROG}.c
+	${CC} ${CFLAGS} $< -o $@ ${LIBS}
 
 # alternative executable
 #
-alt: ${ALT_ENTRY}
+alt: data ${ALT_TARGET}
 	@${TRUE}
 
 # data files
@@ -123,33 +203,51 @@ alt: ${ALT_ENTRY}
 data: ${DATA}
 	@${TRUE}
 
+# both all and alt
+#
+everything: all alt
+
 
 ###############
 # utility rules
 ###############
 #
-everything: all alt
-
 clean:
-	${RM} -f ${ENTRY}.o ${ALT_OBJ}
+	${RM} -f ${OBJ} ${ALT_OBJ}
+	@-if [ -f indent.c ]; then \
+	    echo ${RM} -f indent.c; \
+	    ${RM} -f indent.c; \
+	fi
 
 clobber: clean
-	${RM} -f ${ENTRY} ${ALT_ENTRY}
+	${RM} -f ${TARGET} ${ALT_TARGET}
-
+	@-if [ -e sandwich ]; then \
-nuke: clobber
+	    ${RM} -f sandwich; \
-	@${TRUE}
+	    echo 'ate sandwich'; \
-
+	fi
-dist_clean: nuke
-	@${TRUE}
 
 install:
-	@echo "Surely we are joking Dr. Lehmer!"
+	@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}
+	@if which "${GINDENT}" >/dev/null 2>&1; then \
+	    echo ${RM} -f $@; \
+	    ${RM} -f $@; \
+	    echo "${GINDENT} < $< > $@"; \
+	    ${GINDENT} < $< > $@; \
+	elif which "${INDENT}" >/dev/null 2>&1; then \
+	    echo ${RM} -f $@; \
+	    ${RM} -f $@; \
+	    echo "${INDENT} < $< > $@"; \
+	    ${INDENT} < $< > $@; \
+	else \
+	    echo "no intent tool found, ident $< yourself, sorry"; \
+	    echo "exit 1"; \
+	    exit 1; \
+	fi
 
 
 ##################
@@ -168,35 +266,69 @@ waste:
 	@echo 'haste'
 	@${TRUE}
 
+maker:
+	@echo 'Participate in a maker faire'
+	@${TRUE}
+
 easter_egg:
-	@echo you expected to 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 Readers shall not be disallowed from being unable to not partly misunderstand this partocular final echo.
+	@echo "Eggy"
+
+sandwich: easter_egg
+	@if [ `id -u` -eq 0 ]; then \
+	    echo 'Okay.'; \
+	    echo "$${RANDOM}`date +%s`$${RANDOM}" > $@; \
+	else \
+	    echo 'What? Make it yourself.'; \
+	    exit 1; \
+	fi
 
 # Understand the history of the Homebrew Computer Club
 # 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_v4; \
+	    ${RM} -f .code_anal_v6; \
 	else \
-	    echo "We are not expected to understand that"; \
+	    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"
 	@${TRUE}
 
-deep_magic:
+deep_magic: supernova
 	@-if [ -r .code_anal ]; then \
-	    ccode_analysis --deep_magic 2ed3582ec5c094a093fea2a6bcb9f19439892873c9cc45ed1ceaafe08b7d52e1b2c7cd524be3b0b2 --FNV1a_hash 512-bit "${ENTRY}"; \
+	    ccode_analysis --deep_magic 7889066cdbdf09b0408021754586e895be641cc9be29e7eafd3ca65359541f17 \
+	    		   --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
 	else \
-	    echo "Park different"; \
+	    echo "Wrong! Do it again!"; \
+	    sleep 2; \
+	    echo "Wrong! Do it again!"; \
+	    sleep 2; \
+	    echo "Wrong! Do it again!"; \
 	fi
 	@${TRUE}
 
 magic: deep_magic
 	@-if [ -r .code_anal ]; then \
-	    ccode_analysis --mode 391581 --level 216193 --FNV1a_hash 512-bit "${ENTRY}"; \
+	    ccode_analysis --level 20003 --mode 5717175 --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
 	else \
-	    echo "These aren't the primes you're looking for Paul Erdos!"; \
+	    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?!"; \
 	fi
 	@${TRUE}
+
+# The IOCCC resident astronomer states
+#
+charon: magic
+	@echo "$@ is a dwarf planet"
+	@echo "dwarf is a type of planet"
+	@echo "therefore IAU, $@ is a planet"
+
+pluto: charon
+	${MAKE} charon
+	@echo "$@ is a dwarf planet"
+	@echo "dwarf is a type of planet"
+	@echo "therefore, $@ is a planet"
+	@echo "having lots of planets is good feature because supernovae can help ${MAKE} a lot of them"

2013/mills/README.md

@@ -1,44 +1,46 @@
 # Most timely rendered
 
-Christopher Mills  
+    Christopher Mills  
-<mrxo@sonic.net>  
+    <mrxo@sonic.net>  
 
+# To build:
 
-## Judges' comments:
+```sh
-### To build:
+make
-
+```
-    make mills
 
 ### To run:
 
-    ./mills
+```sh
+./mills
+```
 
 ### Try:
 
-    ./mills &
+```sh
+./mills &
+```
 
 While that is running, point your favorite browser at: [http://localhost:8224](http://localhost:8224)
 
-### Selected Judges Remarks:
+## Judges' comments:
 
 Who will be the first to post an image rendered during a leap-second?
 
 ## Author's comments:
 
-The Program
+### The Program
-===========
 
 This program is a handy graphical clock.  Simply run the program, click *OK* to
-any annoying security dialogs that pop up (aren't those annoying?), then fire
+any annoying security dialog that pop up (aren't those annoying?), then fire
 up your web browser and type in the following URL:
 
->  <http://localhost:8224>
+    <http://localhost:8224>
 
 You will soon be presented with a lovely dynamically rendered 3D scene that
-also convienently tells you the current time!
+also conveniently tells you the current time!
 
-Usage Notes
+### Usage Notes
------------
 
 The program will continue to give you the time of day as it changes by
 reloading the page as often as it can render.  If you grow tired of watching
@@ -50,13 +52,14 @@ money.
 
 It would be possible to fix this by adding
 
-    n=1,setsockopt(s,SOL_SOCKET,SO_REUSEADDR,&n,sizeof n),
+```c
+n=1,setsockopt(s,SOL_SOCKET,SO_REUSEADDR,&n,sizeof n),
+```
 
 at an appropriate spot in the code (an exercise left to the reader).  However,
-as this limitation is documented, it is not techinally a bug.
+as this limitation is documented, it is not technically a bug.
 
-Details of Operation
+### Details of Operation
---------------------
 
 The program wears many hats (not literally).  It is
 
@@ -68,7 +71,7 @@ The program wears many hats (not literally).  It is
 It replies to web requests with a PNG image that uses the
 [Adam7](http://en.wikipedia.org/wiki/Adam7_algorithm)
 encoding to return data progressively.  Since the data is returned in Adam7
-format, the scene is displayed initally at a lower resolution and allowed to
+format, the scene is displayed initially at a lower resolution and allowed to
 be progressively refined as time goes on.  The ray tracer is integrally tied
 to the PNG encoder, casting rays in the Adam7 order.  The web server uses
 PNG primarily because of PNG's ability to return data progressively, and not
@@ -88,11 +91,10 @@ not confirmed) that the code will, in fact, display leap seconds correctly.
 To display the time, of course we would need a font.  This font is encoded
 as a string, using only the C whitespace characters.  Clearly, the judges
 intended this use of whitespace for data compression, since their tool
-doesn't count whitepsace in strings differently than whitespace outside of
+doesn't count whitespace in strings differently than whitespace outside of
 them.
 
-User-modifyable Features
+### User-modifyable Features
-------------------------
 
 The code can be user-modified simply by changing the build command line.
 The following symbols are defined in the build file:
@@ -112,8 +114,7 @@ The following symbols are defined in the build file:
     Defines the position of the viewer (the eyepoint) for the scene.  The eye
     is looking at the origin (0, 0, 0).
 
-Other Build Flags
+### Other Build Flags
------------------
 
 The original program bound the server to `INADDR_ANY` to allow everyone to
 experience the server's output.  The Judges suggested that I instead restrict
@@ -125,11 +126,10 @@ family-friendly version `win_port` to protect against curious impressionable
 youth trying to learn about sockets on Internet.
 
 
---------------------------------------------------------------------------------
+## Copyright:
-<!--
+
 (c) Copyright 1984-2015, [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/
--->