Porting current working set from CVS.

[pdclib.old] / Makefile

diff --git a/Makefile b/Makefile
index 7bfb4011f651fab6f1845a44d2ad728b3a4bc840..e883e60be371a1052067375c94d1d3a5e5b19361 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,15 @@ AUXFILES := Makefile Readme.txt
 PROJDIRS := functions includes internals
 SRCFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.c")
 HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.h")
-INTFILES := atomax digits seed strtox_main strtox_prelim
+INTFILES := atomax digits seed strtox_main strtox_prelim rename remove _Exit
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 TSTFILES := $(patsubst %.c,%.t,$(SRCFILES))
 REGFILES := $(filter-out $(patsubst %,functions/_PDCLIB/%.r,$(INTFILES)),$(patsubst %.c,%.r,$(SRCFILES)))
 DEPFILES := $(patsubst %.c,%.d,$(SRCFILES))
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
+CFLAGS := -Wall -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wconversion -Wstrict-prototypes
+
 .PHONY: clean dist test testdrivers regtest
 
 all: pdclib.a
@@ -19,19 +21,19 @@ pdclib.a: $(OBJFILES)
        @ar r pdclib.a $?
 
 test: testdrivers
-       -@rc=0; for file in $(TSTFILES); do ./$$file; rc=`expr $$rc + $$?`; done; echo; echo "Tests failed: $$rc"
+       -@rc=0; count=0; for file in $(TSTFILES); do ./$$file; rc=`expr $$rc + $$?`; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking PDCLib): $$count  Tests failed: $$rc"
 
 testdrivers: $(TSTFILES)
 
 regtest: regtestdrivers
-       -@rc=0; for file in $(REGFILES); do ./$$file; rc=`expr $$rc + $$?`; done; echo; echo "Regression tests failed: $$rc"
+       -@rc=0; count=0; for file in $(REGFILES); do ./$$file; rc=`expr $$rc + $$?`; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking system libc): $$count  Tests failed: $$rc"
 
 regtestdrivers: $(REGFILES)
 
 -include $(DEPFILES)
 
 clean:
-       -@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz; do if [ -f $$file ]; then rm $$file; fi; done
+       @for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz; do if [ -f $$file ]; then rm $$file; fi; done
 
 dist:
        @tar czf pdclib.tgz $(ALLFILES)
@@ -40,10 +42,10 @@ todolist:
        -@for file in $(ALLFILES); do grep -H TODO $$file; done; true
 
 %.o: %.c Makefile
-       @$(CC) -Wall -DNDEBUG -MMD -MP -MT "$*.d $*.t" -g -std=c99 -I./includes -I./internals -c $< -o $@
+       @$(CC) $(CFLAGS) -Wall -DNDEBUG -MMD -MP -MT "$*.d $*.t" -g -std=c99 -I./includes -I./internals -c $< -o $@
 
 %.t: %.c Makefile pdclib.a
-       @$(CC) -Wall -DTEST -std=c99 -I./includes -I./internals $< pdclib.a -o $@
+       @$(CC) $(CFLAGS) -DTEST -std=c99 -I./includes -I./internals $< pdclib.a -o $@
 
 %.r: %.c Makefile
-       @$(CC) -Wall -DTEST -DREGTEST -std=c99 -I./internals $< -o $@
+       @$(CC) $(CFLAGS) -DTEST -DREGTEST -std=c99 -I./internals $< -o $@