X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=bfa74c69d0aa340800056427a2080da0b7fc78ec;hb=a7a8d2f1c85c2d7760d4d3479e90466cc3a81b04;hp=6748be49117d6479ec9f239b256b2c7eb5efdf7a;hpb=952bd6719db9fde3805335bbfbacc4353f6685da;p=pdclib

diff --git a/Makefile b/Makefile
index 6748be4..bfa74c6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,15 @@ INTFILES := _Exit atomax digits open print scan remove rename seed stdinit strto
 # All object files in the library
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 # All test drivers (.t)
-TSTFILES := $(patsubst %.c,%.t,$(SRCFILES))
+TSTFILES := $(patsubst %.c,%_t,$(SRCFILES))
 # All regression test drivers (.r)
-REGFILES := $(filter-out $(patsubst %,functions/_PDCLIB/%.r,$(INTFILES)),$(patsubst %.c,%.r,$(SRCFILES)))
-# All dependency files (.d)
+REGFILES := $(filter-out $(patsubst %,functions/_PDCLIB/%_r,$(INTFILES)),$(patsubst %.c,%_r,$(SRCFILES)))
+# All library dependency files (.d)
 DEPFILES := $(patsubst %.c,%.d,$(SRCFILES))
+# All test driver dependency files (_t.d)
+TSTDEPFILES := $(patsubst %,%.d,$(TSTFILES))
+# All regression test driver dependency files (_r.d)
+REGDEPFILES := $(patsubst %,%.d,$(REGFILES))
 # All files belonging to the source distribution
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
@@ -33,7 +37,7 @@ PATCHFILES2 := $(shell ls platform/$(PLATFORM)/functions/stdlib/*.c)
 PATCHFILES3 := $(shell ls platform/$(PLATFORM)/functions/stdio/*.c)
 
 WARNINGS := -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -fno-builtin 
-CFLAGS := -g -std=c99 -I./internals $(WARNINGS) $(USERFLAGS)
+CFLAGS := -g -std=c99 -I./internals -I./testing $(WARNINGS) $(USERFLAGS)
 
 .PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
 
@@ -57,6 +61,7 @@ pdclib.a: $(OBJFILES)
 	@echo
 
 test: functions/$(FILE)
+	echo $(TSTDEPFILES)
 	functions/$(FILE)
 
 tests: testdrivers
@@ -71,10 +76,10 @@ regtests: regtestdrivers
 regtestdrivers: $(REGFILES)
 	@echo
 
--include $(DEPFILES)
+#-include $(DEPFILES) $(TSTDEPFILES) $(REGDEPFILES)
 
 clean:
-	@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz scanf_testdata_*; do if [ -f $$file ]; then rm $$file; fi; done
+	@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) pdclib.a pdclib.tgz scanf_testdata_*; do if [ -f $$file ]; then rm $$file; fi; done
 
 srcdist:
 	@tar czf pdclib.tgz $(ALLFILES)
@@ -130,13 +135,13 @@ help:
 
 %.o: %.c Makefile
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -MMD -MP -MT "$*.d $*.t $*.o" -I./includes -c $< -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -I./includes -c $< -o $@
 
-%.t: %.c Makefile pdclib.a
+%_t: %.c Makefile pdclib.a
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -DTEST -I./includes $< pdclib.a -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -DTEST -I./includes $< pdclib.a -o $@
 
-%.r: %.c Makefile
+%_r: %.c Makefile
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -Wno-format -DTEST -DREGTEST $< -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -DTEST -DREGTEST $< -o $@