Adjusted Makefile and svn:ignore for signal/.

[pdclib] / Makefile

diff --git a/Makefile b/Makefile
index 0acd1cc6132e91de48c5445930759832302f499b..266558f2ab7408cda917e391b77f53be9df76bcc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,20 +17,27 @@ 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)
 
+# TODO: This must be possible without four discrete steps.
 # All files in platform/$(PLATFORM)/functions/_PDCLIB (for development only)
 PATCHFILES1 := $(shell ls platform/$(PLATFORM)/functions/_PDCLIB/*.c)
 # All files in platform/$(PLATFORM)/functions/stdlib (for development only)
 PATCHFILES2 := $(shell ls platform/$(PLATFORM)/functions/stdlib/*.c)
 # All files in platform/$(PLATFORM)/functions/stdio (for development only)
 PATCHFILES3 := $(shell ls platform/$(PLATFORM)/functions/stdio/*.c)
+# All files in platform/$(PLATFORM)/functions/signal (for development only)
+PATCHFILES4 := $(shell ls platform/$(PLATFORM)/functions/signal/*.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 -I./testing $(WARNINGS) $(USERFLAGS)
@@ -57,6 +64,7 @@ pdclib.a: $(OBJFILES)
        @echo
 
 test: functions/$(FILE)
+       echo $(TSTDEPFILES)
        functions/$(FILE)
 
 tests: testdrivers
@@ -71,10 +79,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)
@@ -95,6 +103,7 @@ links:
        @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
+       @cd functions/signal && for file in $(PATCHFILES4); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
 
 unlink:
        @echo "Unlinking platform files..."
@@ -130,13 +139,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 $@