From fca5a7864585c2757bc38409607a4fd297440b22 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 21 Feb 2023 19:05:12 -0800 Subject: [PATCH] improve 1990 Makefiles --- 1990/Makefile | 2 +- 1990/baruch/Makefile | 88 +++++++++++------------------- 1990/cmills/Makefile | 89 ++++++++++++------------------ 1990/dds/Makefile | 90 +++++++++++-------------------- 1990/dg/Makefile | 92 ++++++++++++------------------- 1990/dg/dg.c | 122 +++++++++++++++++++++--------------------- 1990/jaw/Makefile | 93 ++++++++++++-------------------- 1990/pjr/Makefile | 87 +++++++++++------------------- 1990/scjones/Makefile | 86 +++++++++++------------------ 1990/stig/Makefile | 86 +++++++++++------------------ 1990/tbr/Makefile | 89 +++++++++++------------------- 1990/theorem/Makefile | 95 ++++++++++++-------------------- 1990/westley/Makefile | 88 +++++++++++------------------- 13 files changed, 415 insertions(+), 692 deletions(-) diff --git a/1990/Makefile b/1990/Makefile index 8aeb36b66..9529d7883 100644 --- a/1990/Makefile +++ b/1990/Makefile @@ -50,7 +50,7 @@ # tool locations ################ # -SHELL= /bin/bash +SHELL= bash MAKE= make diff --git a/1990/baruch/Makefile b/1990/baruch/Makefile index beb78f4ad..7002cc38e 100644 --- a/1990/baruch/Makefile +++ b/1990/baruch/Makefile @@ -328,63 +328,26 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-error -Wno-implicit-function-declaration -Wno-logical-op-parentheses \ -Wno-string-plus-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} -else -ifeq ($(CC),gcc) - -# gcc CSILENCE and CWARN -# -#CSILENCE= -CSILENCE= -Wno-error -Wno-implicit-function-declaration -Wno-logical-op-parentheses \ - -Wno-string-plus-int +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-error -Wno-implicit-function-declaration -Wno-logical-op-parentheses \ - -Wno-string-plus-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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -396,12 +359,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -410,7 +373,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -423,7 +386,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -434,20 +397,31 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-missing-variable-declarations -Wno-format-nonliteral -Wno-poison-system-directories +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/cmills/Makefile b/1990/cmills/Makefile index 2d84c4ec9..c5a9dfbde 100644 --- a/1990/cmills/Makefile +++ b/1990/cmills/Makefile @@ -328,63 +328,26 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-deprecated-declarations -Wno-parentheses -Wno-error -Wno-implicit-function-declaration \ -Wno-format-security -Wno-return-type -Wno-unused-value -# -#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-deprecated-declarations -Wno-parentheses -Wno-error -Wno-implicit-function-declaration \ - -Wno-format-security -Wno-return-type -Wno-unused-value +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} CWARN= -Wall -Wextra ${CSILENCE} #CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-deprecated-declarations -Wno-parentheses -Wno-error -Wno-implicit-function-declaration \ - -Wno-format-security -Wno-return-type -Wno-unused-value -# -#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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -396,12 +359,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # #CDEFINE= CDEFINE= -DM=500 -DN=52 -DX="srand((int)time(0L))" -DV=void -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -410,7 +373,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -423,7 +386,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -434,20 +397,34 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ + -Wno-poison-system-directories -Wno-shadow -Wno-strict-prototypes \ + -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ + -Wno-shorten-64-to-32 +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/dds/Makefile b/1990/dds/Makefile index ad597ffb3..bd065d178 100644 --- a/1990/dds/Makefile +++ b/1990/dds/Makefile @@ -328,66 +328,27 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-builtin-requires-header -Wno-char-subscripts -Wno-conditional-type-mismatch \ -Wno-empty-body -Wno-error -Wno-implicit-function-declaration \ -Wno-incompatible-library-redeclaration -Wno-parentheses -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} -else -ifeq ($(CC),gcc) - -# gcc CSILENCE and CWARN -# -#CSILENCE= -CSILENCE= -Wno-builtin-requires-header -Wno-char-subscripts -Wno-conditional-type-mismatch \ - -Wno-empty-body -Wno-error -Wno-implicit-function-declaration \ - -Wno-incompatible-library-redeclaration -Wno-parentheses -Wno-implicit-int +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-builtin-requires-header -Wno-char-subscripts -Wno-conditional-type-mismatch \ - -Wno-empty-body -Wno-error -Wno-implicit-function-declaration \ - -Wno-incompatible-library-redeclaration -Wno-parentheses -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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -399,12 +360,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -413,7 +374,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -426,7 +387,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -437,20 +398,31 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +#CSILENCE+= +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/dg/Makefile b/1990/dg/Makefile index 1c5d9cc12..f23a1d889 100644 --- a/1990/dg/Makefile +++ b/1990/dg/Makefile @@ -328,60 +328,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 -# CSILENCE -Compiler warnings +# Common C compiler warnings to silence # -ifeq ($(CC),clang) +#CSILENCE= +CSILENCE= -Wno-invalid-pp-token -# clang CSILENCE and CWARN -# -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} - -else -ifeq ($(CC),gcc) - -# gcc CSILENCE and CWARN -# -CSILENCE= -#CSILENCE= -Wno-implicit-int +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# 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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -393,12 +358,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # -#CDEFINE= -CDEFINE= -Dindex=strchr +CDEFINE= +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -407,7 +372,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -420,7 +385,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -431,20 +396,31 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-poison-system-directories -Wno-strict-prototypes +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/dg/dg.c b/1990/dg/dg.c index 348efd2e8..a8943aef5 100644 --- a/1990/dg/dg.c +++ b/1990/dg/dg.c @@ -1,67 +1,65 @@ #include -#define d define - -#d b12(x) 12 x -#d a13(x) x 13 -#d a16(x) x 16 -#d a32(x) x 32 -#d acb(x) x] -#d acc(x) x} -#d aco(x) x: -#d bco(x) :x -#d acp(x) x) -#d bef(x) EOF x -#d aeq(x) x= -#d afo(x) x for -#d age(x) x fgetc -#d asi(x) x stdin -#d aso(x) x stdout -#d bgt(x) >x -#d ai(x) x i -#d aj(x) x j -#d al(x) x l -#d ami(x) x- -#d bne(x) !=x -#d aob(x) x[ -#d aop(x) x( -#d apl(x) x+ -#d bpu(x) fputc x -#d bqm(x) ?x -#d aqm(x) x? -#d aqu(x) x' -#d ase(x) x; -#d awh(x) x while -#d axo(x) x^ -#d a0(x) x 0 -#d b13(x) 13 x -#d b16(x) 16 x -#d b19(x) 19 x -#d b48(x) 48 x -#d a64(x) x 64 -#d b66(x) 66 x -#d bcb(x) ]x -#d bch(x) char x -#d bcm(x) ,x -#d acm(x) x, -#d bcp(x) )x -#d beq(x) =x -#d bex(x) extern x -#d bi(x) i x -#d bin(x) int x -#d bix(x) index x -#d bj(x) j x -#d bl(x) l x -#d alt(x) x< -#d bma(x) main x -#d bob(x) [x -#d boc(x) {x -#d bop(x) (x -#d bpl(x) +x -#d app(x) x++ -#d bqu(x) 'x -#d bse(x) ;x -#d bst(x) *x +#define b12(x) 12 x +#define a13(x) x 13 +#define a16(x) x 16 +#define a32(x) x 32 +#define acb(x) x] +#define acc(x) x} +#define aco(x) x: +#define bco(x) :x +#define acp(x) x) +#define bef(x) EOF x +#define aeq(x) x= +#define afo(x) x for +#define age(x) x fgetc +#define asi(x) x stdin +#define aso(x) x stdout +#define bgt(x) >x +#define ai(x) x i +#define aj(x) x j +#define al(x) x l +#define ami(x) x- +#define bne(x) !=x +#define aob(x) x[ +#define aop(x) x( +#define apl(x) x+ +#define bpu(x) fputc x +#define bqm(x) ?x +#define aqm(x) x? +#define aqu(x) x' +#define ase(x) x; +#define awh(x) x while +#define axo(x) x^ +#define a0(x) x 0 +#define b13(x) 13 x +#define b16(x) 16 x +#define b19(x) 19 x +#define b48(x) 48 x +#define a64(x) x 64 +#define b66(x) 66 x +#define bcb(x) ]x +#define bch(x) char x +#define bcm(x) ,x +#define acm(x) x, +#define bcp(x) )x +#define beq(x) =x +#define bex(x) extern x +#define bi(x) i x +#define bin(x) int x +#define bix(x) index x +#define bj(x) j x +#define bl(x) l x +#define alt(x) x< +#define bma(x) main x +#define bob(x) [x +#define boc(x) {x +#define bop(x) (x +#define bpl(x) +x +#define app(x) x++ +#define bqu(x) 'x +#define bse(x) ;x +#define bst(x) *x bma(acp(bop(app(bcp(ai(boc(ase(bch(a16(bl(alt(bob(ai(b66(ase(bcb(a0(bcm(aeq(bst(acb(bj(a64(bse(aob(bin(al(bi(aeq(bse(ai(bex(aop(bch(afo(bst(ase(bix(()))))))))))))))))))))))))))))))))))))))) bl(ai(bob(aob(bi(al(bcb(aop(beq(apl(b13(a13(bpl(aeq(bop(acb(bl(bob(a32(bi(bpl(apl(b16(bcb(ai(beq(b19(aob(bpl(bop(l)))))))))))))))))))))))))))))) diff --git a/1990/jaw/Makefile b/1990/jaw/Makefile index 24721bbaa..1e0cb51bc 100644 --- a/1990/jaw/Makefile +++ b/1990/jaw/Makefile @@ -328,66 +328,27 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-bitwise-op-parentheses -Wno-error -Wno-implicit-function-declaration \ -Wno-logical-op-parentheses -Wno-parentheses -Wno-return-type \ -Wno-shift-op-parentheses -# -#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-bitwise-op-parentheses -Wno-error -Wno-implicit-function-declaration \ - -Wno-logical-op-parentheses -Wno-parentheses -Wno-return-type \ - -Wno-shift-op-parentheses +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} CWARN= -Wall -Wextra ${CSILENCE} #CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-bitwise-op-parentheses -Wno-error -Wno-implicit-function-declaration \ - -Wno-logical-op-parentheses -Wno-parentheses -Wno-return-type \ - -Wno-shift-op-parentheses -# -#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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -399,12 +360,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -413,7 +374,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -426,7 +387,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -437,20 +398,34 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # 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-implicit-int-conversion -Wno-missing-prototypes \ + -Wno-missing-variable-declarations -Wno-pedantic \ + -Wno-poison-system-directories -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 ############################## diff --git a/1990/pjr/Makefile b/1990/pjr/Makefile index c64e1aa16..737cea687 100644 --- a/1990/pjr/Makefile +++ b/1990/pjr/Makefile @@ -328,60 +328,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 -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # 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} -else -ifeq ($(CC),gcc) - -# gcc CSILENCE and CWARN -# -CSILENCE= -#CSILENCE= -Wno-implicit-int +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# 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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -393,12 +358,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -407,7 +372,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -420,7 +385,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -431,20 +396,32 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ + -Wno-poison-system-directories -Wno-strict-prototypes +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/scjones/Makefile b/1990/scjones/Makefile index f5b1a9768..1441a2fe0 100644 --- a/1990/scjones/Makefile +++ b/1990/scjones/Makefile @@ -328,60 +328,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 -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-invalid-pp-token -Wno-trigraphs -# -#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-invalid-pp-token -Wno-trigraphs +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-invalid-pp-token -Wno-trigraphs -# -#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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -393,12 +358,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -407,7 +372,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -420,7 +385,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -431,20 +396,31 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/stig/Makefile b/1990/stig/Makefile index 37122caa4..55e1c7821 100644 --- a/1990/stig/Makefile +++ b/1990/stig/Makefile @@ -328,60 +328,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 -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # 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} -else -ifeq ($(CC),gcc) - -# gcc CSILENCE and CWARN -# -CSILENCE= -#CSILENCE= -Wno-implicit-int +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# 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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -393,12 +358,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -407,7 +372,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -420,7 +385,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -431,20 +396,31 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +#CSILENCE+= +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/tbr/Makefile b/1990/tbr/Makefile index a8448c2e1..321421cb6 100644 --- a/1990/tbr/Makefile +++ b/1990/tbr/Makefile @@ -328,63 +328,26 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-char-subscripts -Wno-error -Wno-implicit-function-declaration \ -Wno-unused-value -# -#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-char-subscripts -Wno-error -Wno-implicit-function-declaration \ - -Wno-unused-value +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} CWARN= -Wall -Wextra ${CSILENCE} #CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-char-subscripts -Wno-error -Wno-implicit-function-declaration \ - -Wno-unused-value -# -#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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -396,12 +359,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -410,7 +373,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -423,7 +386,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -434,20 +397,32 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # 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-missing-prototypes -Wno-missing-variable-declarations \ + -Wno-pedantic -Wno-poison-system-directories -Wno-strict-prototypes +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/theorem/Makefile b/1990/theorem/Makefile index 84277ac52..0c817ff18 100644 --- a/1990/theorem/Makefile +++ b/1990/theorem/Makefile @@ -328,69 +328,28 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-deprecated-declarations -Wno-empty-body -Wno-error -Wno-unused-value \ -Wno-implicit-function-declaration -Wno-incompatible-pointer-types \ -Wno-macro-redefined -Wno-parentheses -Wno-return-type -Wno-unused-parameter \ -Wno-empty-translation-unit -# -#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-deprecated-declarations -Wno-empty-body -Wno-error -Wno-unused-value \ - -Wno-implicit-function-declaration -Wno-incompatible-pointer-types \ - -Wno-macro-redefined -Wno-parentheses -Wno-return-type -Wno-unused-parameter \ - -Wno-empty-translation-unit +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-deprecated-declarations -Wno-empty-body -Wno-error -Wno-unused-value \ - -Wno-implicit-function-declaration -Wno-incompatible-pointer-types \ - -Wno-macro-redefined -Wno-parentheses -Wno-return-type -Wno-unused-parameter \ - -Wno-empty-translation-unit -# -#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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -402,12 +361,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -416,7 +375,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -429,7 +388,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -440,20 +399,34 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # 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-missing-prototypes -Wno-missing-variable-declarations \ + -Wno-poison-system-directories -Wno-shadow -Wno-strict-prototypes \ + -Wno-unreachable-code -Wno-unused-macros +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## diff --git a/1990/westley/Makefile b/1990/westley/Makefile index 91ab84f06..27c352e2d 100644 --- a/1990/westley/Makefile +++ b/1990/westley/Makefile @@ -328,63 +328,26 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# CWARN - Silence warnings that ${CWARN} would normally complain about -# CSILENCE -Compiler warnings -# -ifeq ($(CC),clang) - -# clang CSILENCE and CWARN +# Common C compiler warnings to silence # #CSILENCE= CSILENCE= -Wno-char-subscripts -Wno-error -Wno-implicit-function-declaration \ -Wno-unused-value -Wno-unused-variable -# -#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-char-subscripts -Wno-error -Wno-implicit-function-declaration \ - -Wno-unused-value -Wno-unused-variable +# Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} #CWARN= -Wall -Wextra ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE} -else - -# default CSILENCE and WARN -# -#CSILENCE= -CSILENCE= -Wno-char-subscripts -Wno-error -Wno-implicit-function-declaration \ - -Wno-unused-value -Wno-unused-variable -# -#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 +# Compiler standard # #CSTD= #CSTD= -ansi CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 @@ -396,12 +359,12 @@ CSTD= -std=gnu90 # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= -#CDEFINE= -DIOCCC=26 +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= #CINCLUDE= -include stdlib.h @@ -410,7 +373,7 @@ CINCLUDE= #CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# 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 @@ -423,7 +386,7 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} @@ -434,20 +397,31 @@ LIBS= #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +#CSILENCE+= +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ##############################