Reworked scanf() testing. General cleanups.

[fw/pdclib] / Makefile

diff --git a/Makefile b/Makefile
index 346d81b2eb332af998956a0f6874a9e1226d568f..bfa74c69d0aa340800056427a2080da0b7fc78ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,12 @@ OBJFILES := $(patsubst %.c,%.o,$(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)
+# 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)
 
@@ -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)
@@ -92,7 +97,6 @@ links:
        @echo "Linking platform/$(PLATFORM)..."
        @cd internals && ln -s ../platform/$(PLATFORM)/internals/_PDCLIB_config.h
        @cd includes && ln -s ../platform/$(PLATFORM)/includes/float.h
-       @cd testing && ln -s ../platform/$(PLATFORM)/testing/printf_reference.txt
        @cd functions/_PDCLIB && for file in $(PATCHFILES1); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
        @cd functions/stdlib && for file in $(PATCHFILES2); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
        @cd functions/stdio && for file in $(PATCHFILES3); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
@@ -101,7 +105,6 @@ unlink:
        @echo "Unlinking platform files..."
        @if [ -f internals/_PDCLIB_config.h ]; then rm internals/_PDCLIB_config.h; fi
        @if [ -f includes/float.h ]; then rm includes/float.h; fi
-       @if [ -f testing/printf_reference.txt ]; then rm testing/printf_reference.txt; fi
        @cd functions/_PDCLIB && for file in $(PATCHFILES1); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
        @cd functions/stdlib && for file in $(PATCHFILES2); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
        @cd functions/stdio && for file in $(PATCHFILES3); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done