fix Makefile and README.md for 2001/ollinger

2001/ollinger/Makefile

@@ -1,18 +1,9 @@
 #!/usr/bin/env make
 #
-# IOCCC 2001 entry Makefile
+# IOCCC 2001 winning entry - ollinger
 
 ################################################################################
 #
-# An Historical Makefile NOTE:
-#
-# The orig.Makefile, if it exits, is the original Makefile before this IOCCC
-# year directory was reworked so that entries are in separate directories.
-# This also applies to any orig.ansi.mk and orig.common.mk files.
-#
-# Several Makefiles were modified / formed in 2022, and as such it may have
-# elements that are not historically compatible with way entries were built.
-#
 # Regarding individual entries:
 #
 # IOCCC winning entry code may not work on your system.  Even with standards,
@@ -45,192 +36,291 @@
 # See: http://creativecommons.org/licenses/by-sa/3.0/
 
 
-SHELL= /bin/sh
+#############################
-CAT= cat
+# shell used by this Makefile
-RM= rm
+#############################
-SED= sed
-TRUE= true
-#CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2
-
-# optimization
 #
-# Most compiles will safely use -O2.  Some can use only -O.
+SHELL= bash
-# A few compilers have broken optimizers and thus you may
+
-# not want anything.
+#######################
+# common tool locations
+#######################
+#
+include ../../var.mk
+
+# Set X11_LIBDIR to the directory where the X11 library resides
+#
+#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/X11/include
+X11_INCDIR= /opt/X11/include
+
+# Common C compiler warnings to silence
+#
+#CSILENCE=
+CSILENCE= -Wno-error -Wno-implicit-function-declaration -Wno-unused-parameter
+
+# 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=gnu99
+
+# Compiler bit architecture
+#
+# Some entries require 32-bitness:
+# ARCH= -m32
+#
+# Some entries require 64-bitness:
+# ARCH= -m64
+#
+# By default we assume nothing:
+#
+ARCH=
+
+# Defines that are needed to compile
+#
+CDEFINE=
+#CDEFINE= -DIOCCC
+
+# 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= -O2
+#OPT= -O1
+#OPT= -O2
+OPT= -O3
 
-# flags for ANSI compiles
+# Default flags for ANSI C compilation
 #
-# NOTE: Some ANSI compilers make use of -Xa to turn on ANSI mode,
+CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT}
-#	others such as gcc may want -ansi, others (Compaq Tru64 Unix)
-#       want -std1, and others may want nothing at all.
-#       Adjust the CFLAGS line as needed.
-#
-# NOTE: Some compilers cannot optimize, or optimize some entries
-#	incorrectly.  You might want to turn on -O to see if your
-#	compiler can handle them.
-#
-#
-#CFLAGS= -Xa ${OPT}
-#CFLAGS= -std1 $(OPT)
-CFLAGS= -ansi ${OPT}
 
-# NOTE: On some systems, the library path does not include the location
+# Libraries needed to build
-#	of the X11 libraries.  You might need to use a -L/path/to/X11/lib/dir
-#	in order to compile with these libs.
 #
-X11CCFLAGS= -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I/usr/include/X11
+LIBS=
-#X11CCFLAGS=
+#LIBS= -lm
-X11LDFLAGS= -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib
+#LIBS= -L ${X11_LIBDIR} -lX11
-#X11LDFLAGS=
+#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
-MAY_NEED_GCC= gcc
+#CC=clang
+#CC=gcc
 
-# winners that compile under ANSI C
+# Compiler add-ons or replacements for clang only
 #
-WINNERS= anonymous bellard bellard.otccex cheong coupard \
+ifeq ($(CC),clang)
-	 ctk dgbeards herrmann1 herrmann2 jason kev ollinger rosten \
-	 schweikh westley williams
-ALT_NAMES= westley.orig
-DATA_FILES= anonymous_files bellard_files herrmann1_files herrmann2_files
-
-
-all: ${WINNERS}
-
-# Most likely to amaze
 #
-anonymous: anonymous.c
+CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \
-	magic='${MAY_NEED_GCC} -O1'; \
+	-Wno-poison-system-directories -Wno-sign-conversion
-	X='-DA(X)=#X'; \
-	warning='-pedantic -Dprocessor'; \
-	$$magic $$warning -Dmagic= $$X "-DX=A($$magic \"$$X\")" \
-		-o anonymous anonymous.c
-
-anonymous_files: anonymous.ten.c
-
-# Best abuse of the rules
 #
-bellard: bellard.c
+CWARN+= -Weverything
-	${CC} -rdynamic ${CFLAGS} bellard.c -o bellard -ldl
-
-bellard_files: bellard.otccex.c
-
-# Best short program
 #
-cheong: cheong.c
+endif
-	${CC} ${CFLAGS} cheong.c -o cheong
 
-# Most obfuscated sound
+# Specific add-ons or replacements for gcc only
 #
-coupard: coupard.c
+ifeq ($(CC),gcc)
-	${CC} ${CFLAGS} -o coupard coupard.c
-
-# Worst Driver
 #
-ctk: ctk.c
+#CSILENCE+=
-	${CC} ${CFLAGS} -o ctk ctk.c
-
-# Worst AI
 #
-dgbeards: dgbeards.c
+#CWARN+=
-	${CC} ${CFLAGS} -DE=break -DF=char -DK=case -DP=int -DR=return \
-	      -DI=0xFFFF dgbeards.c -o dgbeards
-
-# Best abuse of the C preprocessor
 #
-herrmann1: herrmann1.c herrmann1.sh
+endif
-	@echo "NOTE: $@ must be built/run using the script $@.sh"
-	${SHELL} ./herrmann1.sh
 
-herrmann1_files: herrmann1.gcd herrmann1.sh herrmann1.times2
 
-# Most eye-crossing
+##############################
+# Special flags for this entry
+##############################
 #
-# This entry requires the GCC -include feature.
+ENTRY= ollinger
+PROG= ${ENTRY}
 #
-herrmann2: herrmann2.c
+OBJ= ${PROG}.o
-	${MAY_NEED_GCC} ${CFLAGS} herrmann2.c -o herrmann2 \
+DATA=
-	     -include /usr/include/stdlib.h -include /usr/include/stdio.h \
+TARGET= ${PROG}
-	     -include /usr/include/time.h -include /usr/include/unistd.h
-
-herrmann2_files: herrmann2.cup herrmann2.ioccc
-
-# Best Of Show
 #
-jason: jason.c
+ALT_OBJ=
-	${CC} ${CFLAGS} -o jason jason.c
+ALT_TARGET=
 
-# Best Curses Game
+
+#################
+# build the entry
+#################
 #
-kev: kev.c
+all: data ${TARGET}
-	${CC} ${CFLAGS} -DPORT=5455 -DSPEED=50 -o kev kev.c \
-		-lcurses -ltermcap \
-		-Dl_="socket(il.sin_family=AF_INET,SOCK_STREAM,0)"
-
-# Best primal ASCII graphics
-#
-ollinger: ollinger.c
-	${CC} ${CFLAGS} ollinger.c -o ollinger
-
-# Best abuse of the user
-#
-rosten: rosten.c
-	${CC} ${CFLAGS} rosten.c ${X11CCFLAGS} ${X11LDFLAGS} -pedantic -lX11 \
-		-o rosten
-
-# Best one-liner
-#
-schweikh: schweikh.c
-	${CC} ${CFLAGS} schweikh.c -o schweikh
-
-# Best position-independant code
-#
-westley: westley.c
-	${CC} ${CFLAGS} westley.c -o westley
-
-westley.orig: westley.orig.c
-	${CC} ${CFLAGS} westley.orig.c -o westley.orig
-
-# Best position-independant code
-#
-williams: williams.c
-	${CC} williams.c ${X11CCFLAGS} ${X11LDFLAGS} -lX11 -o williams
-
-everything: ${WINNERS} ${ALT_NAMES} ${DATA_FILES}
-
-love:
-	@echo 'not war?'
-
-haste:
-	${MAKE} waste
-
-waste:
-	@echo 'waste'
-
-clean:
-	${RM} -f *.o a.out core ${WINNERS}
-
-clobber: clean
-	${RM} -f ${WINNERS}
-	${RM} -f ${ALT_NAMES}
-
-nuke: clobber
 	@${TRUE}
 
-install: all
+.PHONY: all alt data everything clean clobber install \
-	${CAT} ${WINNERS} ${ALT_NAMES} > /dev/null
+	love haste waste maker easter_egg sandwich \
+	supernova deep_magic magic charon pluto
+
+${PROG}: ${PROG}.c
+	${CC} ${CFLAGS} $< -o $@ ${LIBS}
+
+# alternative executable
+#
+alt: data ${ALT_TARGET}
+	@${TRUE}
+
+# data files
+#
+data: ${DATA}
+	@${TRUE}
+
+# both all and alt
+#
+everything: all alt
+
+
+###############
+# utility rules
+###############
+#
+clean:
+	${RM} -f ${OBJ} ${ALT_OBJ}
+	@-if [ -f indent.c ]; then \
+	    echo ${RM} -f indent.c; \
+	    ${RM} -f indent.c; \
+	fi
+
+clobber: clean
+	${RM} -f ${TARGET} ${ALT_TARGET}
+	@-if [ -e sandwich ]; then \
+	    ${RM} -f sandwich; \
+	    echo 'ate sandwich'; \
+	fi
+
+install:
+	@echo "Dr. Spock says that is not logical!"
+	@${TRUE}
+
+# you may be able to misunderstand the source by reading indent.c
+#
+indent.c: ${PROG}.c
+	@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
+
+
+##################
+# 133t hacker rulz
+##################
+#
+love:
+	@echo 'not war?'
+	@${TRUE}
+
+haste:
+	$(MAKE) waste
+	@${TRUE}
+
+waste:
+	@echo 'haste'
+	@${TRUE}
+
+maker:
+	@echo 'Participate in a maker faire'
+	@${TRUE}
+
+easter_egg:
+	@echo "you expected to often misunderstand this $${RANDOM} magic"
+	@echo "chongo '<was here>' /\\oo/\\"
+	@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: sandwich
+	@-if [ -r .code_anal ]; then \
+	    ${RM} -f .code_anal_v6; \
+	else \
+	    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: supernova
+	@-if [ -r .code_anal ]; then \
+	    ccode_analysis --deep_magic 7889066cdbdf09b0408021754586e895be641cc9be29e7eafd3ca65359541f17 \
+	    		   --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
+	else \
+	    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 --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?!"; \
+	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"

2001/ollinger/README.md

@@ -1,4 +1,4 @@
-Best primal ASCII graphics:
+# Best primal ASCII graphics:
 
     Nicolas Ollinger
     Ecole Normale Superieure de Lyon
@@ -9,101 +9,103 @@ Best primal ASCII graphics:
 
     http://www.ens-lyon.fr/~nollinge/
 
+# To build:
 
-Judges' Comments:
+```sh
+make
+```
 
-    To build:
+### To run:
 
-    	make ollinger
+```sh
+./ollinger integer
+```
 
-     Try:
+### Try:
 
-	In a large window, say 200 chars wide and 100 high (200x100)
+```sh
-	with a tiny font, try:
+./ollinger 1000 | cut -c -200
+```
 
-	    ./ollinger 1000 | cut -c -200
+Try the above command in a large window, say 200 chars wide and 100
+high (200x100) with a tiny font,
 
+## Judges' comments:
 
-     Do get lost in the programs line of thought!  :-)
+Do get lost in the programs line of thought!  :-)
 
+## Author's comments:
 
-Selected Author's Comments:
+### What's this?
 
-    What's this?
+What do you see? On the left, you will see an enumeration of all successive
-    ------------
+primes from 2 to the parameter you gave to the program. On the right part,
+you can see the sieve used to find these primes. The big diagonals from
+right to left are used to erase composed numbers. When no diagonal crosses
+a number, then the left cell take value 1 and the number is prime.
 
-    What do you see? On the left, you will see an enumeration of all successive
+The parallel version of this algorithm works in real time n. This C
-    primes from 2 to the parameter you gave to the program. On the right part,
+sequential version is slower as it works in O(n*log n). But you have some
-    you can see the sieve used to find these primes. The big diagonals from
+nice picture instead... the cost is a constant number of operation for each
-    right to left are used to erase composed numbers. When no diagonal crosses
+character printed on the screen.
-    a number, then the left cell take value 1 and the number is prime.
 
-    The parallel version of this algorithm works in real time n. This C
+### Why do you wrote it?
-    sequential version is slower as it works in O(n*log n). But you have some
-    nice picture instead... the cost is a constant number of operation for each
-    character printed on the screen.
 
+Let's just quote the FAQ :
 
-    Why do you wrote it?
+Q: Are there types of entries that are submitted so frequently that the
-    --------------------
+   judges get tired of them?
 
-    Let's just quote the FAQ :
+A: Yes, there are types of entries that show up over and over again.
+   The guidelines say:
 
-    Q: Are there types of entries that are submitted so frequently that the
+	    We tend to dislike programs that:
-       judges get tired of them?
+	    are similar to previous winners
 
-    A: Yes, there are types of entries that show up over and over again.
+      We like variety. However too often we see (please look at the winning
-       The guidelines say:
+      examples given to be aware of the level of the competition):
 
-                We tend to dislike programs that:
+(snip)
-                are similar to previous winners
 
-          We like variety. However too often we see (please look at the winning
+	    generating small primes (below is the list of all
-          examples given to be aware of the level of the competition):
+				     prime related winners)
+		  1985/august
+		  1988/applin
+		  1994/weisberg
+		  1995/makarios
+		  1996/dalbec
+		  2000/bellard
 
-    (snip)
+	    As you can see, just a list of primes (let alone small primes)
+	     does not cut it anymore.
 
-                generating small primes (below is the list of all
+(snip)
-                                         prime related winners)
-                      1985/august
-                      1988/applin
-                      1994/weisberg
-                      1995/makarios
-                      1996/dalbec
-                      2000/bellard
 
-                As you can see, just a list of primes (let alone small primes)
+	    entries that use some complex state machine/table to print
-                 does not cut it anymore.
+	    something
 
-    (snip)
+		  1988/isaak
+		  1988/phillipps
 
-                entries that use some complex state machine/table to print
+	    Unbeaten for 12 years and counting...
-                something
 
-                      1988/isaak
+I think this is enough motivation for trying to submit a program which uses
-                      1988/phillipps
+some complex state machine/table to generate small primes and print them.
 
-                Unbeaten for 12 years and counting...
+### The way it works
 
-    I think this is enough motivation for trying to submit a program which uses
+This program simply prints the space-time diagram of some particular
-    some complex state machine/table to generate small primes and print them.
+cellular automaton. The automaton is a 9-state automaton by Korec in 1998.
+It is an optimization of an old automaton for recognizing primes designed
+by Fischer in 1965.
 
+The table of the automaton is encoded into the string e and consists of
+345 transitions of the kind f(left,middle,right). This encoding into e
+is obfuscated to reduce its size, restrict it to characters 32 to 127 and
+guarantee a constant time.
 
-    The way it works
+The main loop simply iterates this transition function on each cell.
-    ----------------
 
-    This program simply prints the space-time diagram of some particular
+"The rest is silence" (Hamlet, V.2)
-    cellular automaton. The automaton is a 9-state automaton by Korec in 1998.
-    It is an optimization of an old automaton for recognizing primes designed
-    by Fischer in 1965.
 
-    The table of the automaton is encoded into the string e and consists of
+Enjoy!
-    345 transitions of the kind f(left,middle,right). This encoding into e
-    is obfuscated to reduce its size, restrict it to characters 32 to 127 and
-    guarantee a constant time.
-
-    The main loop simply iterates this transition function on each cell.
-
-    "The rest is silence" (Hamlet, V.2)
-
-    Enjoy!