From 0e3acd6739e56b0556531e9f05edfc919b96f76d Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Thu, 11 May 2023 02:26:38 -0700 Subject: [PATCH] sgit -e 's/[[:space:]]$//g' '*Makefile' At the request of Landon all Makefiles have had trailing spaces removed. The request also included README.md files but this is more complicated as some lines have to end in spaces in order to force line breaks. For Makefiles it's fine though. Tested the Makefiles by doing 'make clobber all everything' from the root directory and all appears to be fine. This testing is important because depending on how this process (removal of trailing spaces) was done it could break the Makefiles; for instance trying something like: sgit -e 's/\s.*$//g' '*Makefile' would rather break the Makefiles. This makes sense to anyone who knows my script (and obviously sed :-) ) as long as they're not also tired but I AM tired and so it was the first thing I tried (without thinking of course ... though I had first thought of the correct way :-) ). But what happens to the universes (yes I at least want to believe in the multiverse theory and I hope it's true :-) ) when trailing spaces are removed? :-) As it turns out the only Makefiles touched were: modified: 1987/wall/Makefile modified: 1992/adrian/Makefile modified: 1994/ldb/Makefile modified: 2000/anderson/Makefile modified: 2001/anonymous/Makefile modified: 2001/bellard/Makefile modified: 2004/kopczynski/Makefile modified: 2015/howe/spoiler/Makefile modified: 2019/karns/Makefile and most of them were my fault. --- 1987/wall/Makefile | 4 +- 1992/adrian/Makefile | 4 +- 1994/ldb/Makefile | 4 +- 2000/anderson/Makefile | 4 +- 2001/anonymous/Makefile | 2 +- 2001/bellard/Makefile | 2 +- 2004/kopczynski/Makefile | 2 +- 2015/howe/spoiler/Makefile | 138 ++++++++++++++++++------------------- 2019/karns/Makefile | 2 +- 9 files changed, 81 insertions(+), 81 deletions(-) diff --git a/1987/wall/Makefile b/1987/wall/Makefile index c41d661e6..3edd2f5eb 100644 --- a/1987/wall/Makefile +++ b/1987/wall/Makefile @@ -115,8 +115,8 @@ OBJ= ${PROG}.o DATA= TARGET= ${PROG} # -ALT_OBJ= -ALT_TARGET= +ALT_OBJ= +ALT_TARGET= ################# diff --git a/1992/adrian/Makefile b/1992/adrian/Makefile index ce86316aa..9e2e27f42 100644 --- a/1992/adrian/Makefile +++ b/1992/adrian/Makefile @@ -118,8 +118,8 @@ OBJ= ${PROG}.o DATA= TARGET= ${PROG} # -ALT_OBJ= -ALT_TARGET= +ALT_OBJ= +ALT_TARGET= ################# diff --git a/1994/ldb/Makefile b/1994/ldb/Makefile index 23f03d9c9..1b8d8425f 100644 --- a/1994/ldb/Makefile +++ b/1994/ldb/Makefile @@ -111,8 +111,8 @@ OBJ= ${PROG}.o DATA= TARGET= ${PROG} # -ALT_OBJ= -ALT_TARGET= +ALT_OBJ= +ALT_TARGET= # FORCE use of -trigraphs # diff --git a/2000/anderson/Makefile b/2000/anderson/Makefile index 7dfa31eda..c66e9d5a1 100644 --- a/2000/anderson/Makefile +++ b/2000/anderson/Makefile @@ -114,8 +114,8 @@ OBJ= ${PROG}.o DATA= TARGET= ${PROG} # -ALT_OBJ= -ALT_TARGET= +ALT_OBJ= +ALT_TARGET= ################# diff --git a/2001/anonymous/Makefile b/2001/anonymous/Makefile index eb0530ae1..f870e5b07 100644 --- a/2001/anonymous/Makefile +++ b/2001/anonymous/Makefile @@ -116,7 +116,7 @@ ENTRY= anonymous PROG= ${ENTRY} # OBJ= ${PROG}.o -DATA= +DATA= TARGET= ${PROG} ${PROG}.ten # ALT_OBJ= diff --git a/2001/bellard/Makefile b/2001/bellard/Makefile index c4634b8d4..533140bfb 100644 --- a/2001/bellard/Makefile +++ b/2001/bellard/Makefile @@ -55,7 +55,7 @@ CSTD= -std=gnu99 # Some entries require 32-bitness: ARCH= -m32 # Some entries require 64-bitness: ARCH= -m64 # -ARCH= +ARCH= # Defines that are needed to compile # diff --git a/2004/kopczynski/Makefile b/2004/kopczynski/Makefile index 4f3266e2f..d1166556f 100644 --- a/2004/kopczynski/Makefile +++ b/2004/kopczynski/Makefile @@ -66,7 +66,7 @@ CINCLUDE= # Optimization # -OPT= +OPT= # Default flags for ANSI C compilation # diff --git a/2015/howe/spoiler/Makefile b/2015/howe/spoiler/Makefile index bc95387b4..4a875a465 100644 --- a/2015/howe/spoiler/Makefile +++ b/2015/howe/spoiler/Makefile @@ -1,69 +1,69 @@ -.POSIX : - -.SUFFIXES : -A = .a -O = .o -.SUFFIXES : .c .h .i $O $A - -######################################################################## -### No further configuration beyond this point. -######################################################################## - -top_srcdir := .. -CC := gcc -CFLAGS := -g -O2 -std=c99 -Wall -pedantic -Wno-char-subscripts -LDFLAGS := - -# Assume a POSIX compliant shell. -# -# On Linux -# /bin/sh = /bin/bash -# -# On NetBSD -# /bin/ksh -# /usr/pkg/bin/bash -# -# On OpenBSD -# /bin/ksh = /bin/pdksh -# -SHELL := /bin/ksh - -W64CC := i686-w64-mingw32-gcc -W64CFLAGS := -I. -Os -s -std=c99 -Wno-char-subscripts - -ZIP := README.txt prog-w64.exe prog-test.sh avgtime.sh makeholes-w64.exe - -.c$O : - ${CC} ${CFLAGS} -c $< - -.c$E : - $(CC) $(CFLAGS) $(LDFLAGS) -o$* $< - -$O : - $(LD) $(LDFLAGS) -o$* $*$O - -.c.i: - ${CC} -E ${CFLAGS} $*.c >$*.i - -######################################################################## - -all: build - -build: prog - -clean: - -rm prog *.exe *.i *$O *.tmp *.rej *.orig *.core *.out 2>/dev/null - -distclean: clean - -prog: prog.c - ${CC} ${CFLAGS} ${LDFLAGS} -o$@ prog.c - -prog-w64: err.h prog.c - ${W64CC} ${W64CFLAGS} ${LDFLAGS} -o$@ prog.c - -test: - ${SHELL} ${top_srcdir}/prog-test.sh - -test-w64: - ${SHELL} ${top_srcdir}/prog-test.sh -w +.POSIX : + +.SUFFIXES : +A = .a +O = .o +.SUFFIXES : .c .h .i $O $A + +######################################################################## +### No further configuration beyond this point. +######################################################################## + +top_srcdir := .. +CC := gcc +CFLAGS := -g -O2 -std=c99 -Wall -pedantic -Wno-char-subscripts +LDFLAGS := + +# Assume a POSIX compliant shell. +# +# On Linux +# /bin/sh = /bin/bash +# +# On NetBSD +# /bin/ksh +# /usr/pkg/bin/bash +# +# On OpenBSD +# /bin/ksh = /bin/pdksh +# +SHELL := /bin/ksh + +W64CC := i686-w64-mingw32-gcc +W64CFLAGS := -I. -Os -s -std=c99 -Wno-char-subscripts + +ZIP := README.txt prog-w64.exe prog-test.sh avgtime.sh makeholes-w64.exe + +.c$O : + ${CC} ${CFLAGS} -c $< + +.c$E : + $(CC) $(CFLAGS) $(LDFLAGS) -o$* $< + +$O : + $(LD) $(LDFLAGS) -o$* $*$O + +.c.i: + ${CC} -E ${CFLAGS} $*.c >$*.i + +######################################################################## + +all: build + +build: prog + +clean: + -rm prog *.exe *.i *$O *.tmp *.rej *.orig *.core *.out 2>/dev/null + +distclean: clean + +prog: prog.c + ${CC} ${CFLAGS} ${LDFLAGS} -o$@ prog.c + +prog-w64: err.h prog.c + ${W64CC} ${W64CFLAGS} ${LDFLAGS} -o$@ prog.c + +test: + ${SHELL} ${top_srcdir}/prog-test.sh + +test-w64: + ${SHELL} ${top_srcdir}/prog-test.sh -w diff --git a/2019/karns/Makefile b/2019/karns/Makefile index e7a66e012..ebcf1f63a 100644 --- a/2019/karns/Makefile +++ b/2019/karns/Makefile @@ -68,7 +68,7 @@ CINCLUDE= # Optimization # -OPT= +OPT= # Default flags for ANSI C compilation #