X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=Makefile;h=802e28e3272c6637a5c8a079a304769be6a435f7;hp=95006046f816053209d22bd0c22936baaeaf5398;hb=e25ac2ecee6251afcec84e08165e454fb6bc256c;hpb=4e46e25a507c6b6a7497adfc8ec9f9ab6e14addc

diff --git a/Makefile b/Makefile
index 9500604..802e28e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,45 @@
 # This is a list of all non-source files that are part of the distribution.
 AUXFILES := Makefile Readme.txt
 
-SRCFILES := $(shell find . -name "*.c" -mindepth 1 -maxdepth 3)
-HDRFILES := $(shell find . -name "*.h" -mindepth 1 -maxdepth 3)
+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"))
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 TSTFILES := $(patsubst %.c,%.t,$(SRCFILES))
+REGFILES := $(filter-out $(INTFILES),$(patsubst %.c,%.r,$(SRCFILES)))
 DEPFILES := $(patsubst %.c,%.d,$(SRCFILES))
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
-.PHONY: all clean dist
+.PHONY: clean dist test regtest
 
-all: $(OBJFILES)
-	ar r pdclib.a $?
+all: pdclib.a
+
+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"
 
+regtest: $(REGFILES)
+	-@rc=0; for file in $(REGFILES); do ./$$file; rc=`expr $$rc + $$?`; done; echo; echo "Regression tests failed: $$rc"
+
 -include $(DEPFILES)
 
 clean:
-	-@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) pdclib.a; 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) -DNDEBUG -MMD -MP -MT "$*.d $*.t" -g -std=c99 -I./internals -c $< -o $@
+	@$(CC) -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 $@
 
-%.t: %.c Makefile
-	$(CC) -DTEST -std=c99 -I./internals/ $< -o $@
+%.r: %.c Makefile
+	@$(CC) -Wall -DTEST -DREGTEST -std=c99 -I./internals $< -o $@