X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=7cc747437d8ae1b7594ce3828c0268cb126f6a78;hb=d9dcf16664c81809258992e1653ecb68c8079974;hp=bbcba46bd9c8e3f840e026805296845a4d754b00;hpb=66bcad444a2eabef9e09d3cf7e155b9d35d897de;p=pdclib.old

diff --git a/Makefile b/Makefile
index bbcba46..7cc7474 100644
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,53 @@
+# $Id$
+
 # This is a list of all non-source files that are part of the distribution.
 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 := $(patsubst %.c,%.r,$(shell find functions/_PDCLIB -name "*.c"))
+INTFILES := atomax digits seed strtox_main strtox_prelim rename remove _Exit
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 TSTFILES := $(patsubst %.c,%.t,$(SRCFILES))
-REGFILES := $(filter-out $(INTFILES),$(patsubst %.c,%.r,$(SRCFILES)))
+REGFILES := $(filter-out $(patsubst %,functions/_PDCLIB/%.r,$(INTFILES)),$(patsubst %.c,%.r,$(SRCFILES)))
 DEPFILES := $(patsubst %.c,%.d,$(SRCFILES))
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
-.PHONY: all clean dist
+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
 
-all: $(OBJFILES)
+pdclib.a: $(OBJFILES)
 	@ar r pdclib.a $?
 
-test: $(TSTFILES)
-	-@rc=0; for file in $(TSTFILES); do ./$$file; rc=`expr $$rc + $$?`; done; echo; echo "Tests failed: $$rc"
+test: testdrivers
+	-@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"
 
-regtest: $(REGFILES)
-	-@rc=0; for file in $(REGFILES); do ./$$file; rc=`expr $$rc + $$?`; done; echo; echo "Regression tests failed: $$rc"
+testdrivers: $(TSTFILES)
+
+regtest: regtestdrivers
+	-@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)
 
+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./internals -c $< -o $@
+	@$(CC) $(CFLAGS) -Wall -DNDEBUG -MMD -MP -MT "$*.d $*.t" -g -std=c99 -I./includes -I./internals -c $< -o $@
 
-%.t: %.c Makefile all
-	@$(CC) -Wall -DTEST -std=c99 -I./internals/ $< pdclib.a -o $@
+%.t: %.c Makefile pdclib.a
+	@$(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 $@