X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=23b815b2ea6c314871ae1c64c580382f65c36c30;hb=82137033fa3ea0e6d5b3939ab379b4a4f08d89f2;hp=71f2c1e761ad9855c7c26e70daf41ea56d8304b3;hpb=ba5eff8dd9b426485e1559b5d6204692d155d9e8;p=pdclib

diff --git a/Makefile b/Makefile
index 71f2c1e..23b815b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,33 @@
 # 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")
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 TSTFILES := $(patsubst %.c,%.t,$(SRCFILES))
 DEPFILES := $(patsubst %.c,%.d,$(SRCFILES))
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
-CPPFLAGS  := -MMD -MP
-CFLAGS    := -g -std=c99 -I./internals/
-
 .PHONY: all clean dist
 
 all: $(OBJFILES)
-	ar r 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"
+	-@rc=0; for file in $(TSTFILES); do echo "Testing $$file..."; ./$$file; rc=`expr $$rc + $$?`; done; echo; echo "Tests failed: $$rc"
 
 -include $(DEPFILES)
 
 clean:
-	-@for file in $(OBJFILES) $(DEPFILES) pdclib.a; do if [ -f $$file ]; then rm $$file; fi; done
+	-@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) pdclib.a; do if [ -f $$file ]; then rm $$file; fi; done
 
 dist:
 	@tar czf pdclib.tgz $(ALLFILES)
 
 %.o: %.c Makefile
-	$(CC) -DNDEBUG -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+	@$(CC) -Wall -DNDEBUG -MMD -MP -MT "$*.d $*.t" -g -std=c99 -I./internals -c $< -o $@
 
-%.t: %.c Makefile
-	$(CC) -DTEST $(CFLAGS) $< -o $@
+%.t: %.c Makefile all
+	@$(CC) -Wall -DTEST -std=c99 -I./internals/ $< pdclib.a -o $@