Beautified output.

[pdclib] / Makefile

diff --git a/Makefile b/Makefile
index 1a901ed95641f41bc5a71509753c5aaa5b4a3c27..ab9e812f34cde897da9b109f3b30c5a5da0c8c50 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ SRCFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.c")
 # All header files of the project
 HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.h")
 # All .c files in functions/_PDCLIB that do not have a regression test driver
-INTFILES := _Exit atomax digits print rename remove seed strtox_main strtox_prelim
+INTFILES := _Exit atomax digits open print rename remove seed stdinit strtox_main strtox_prelim
 # All object files in the library
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 # All test drivers (.t)
@@ -27,22 +27,27 @@ PATCHFILES1 := $(shell ls platform/example/functions/_PDCLIB/*.c)
 # All files in platform/example/functions/stdlib (for development only)
 PATCHFILES2 := $(shell ls platform/example/functions/stdlib/*.c)
 
-CFLAGS := -Wall -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wconversion -Wstrict-prototypes
+CFLAGS := -Wall -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wconversion -Wstrict-prototypes -fno-builtin
 
-.PHONY: all clean dist tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
+.PHONY: all clean dist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
 
 all: pdclib.a
 
 pdclib.a: $(OBJFILES)
-       @ar r pdclib.a $?
+       @echo " AR      $@"
+       @ar rc pdclib.a $?
+       @echo
+
+test: $(FILE)
+       $(FILE)
 
 tests: testdrivers
-       -@rc=0; count=0; for file in $(TSTFILES); do echo " TST $$file"; ./$$file; rc=`expr $$rc + $$?`; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking PDCLib): $$count  Tests failed: $$rc"
+       -@rc=0; count=0; echo; for file in $(TSTFILES); do echo " TST   $$file"; ./$$file; rc=`expr $$rc + $$?`; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking PDCLib): $$count  Tests failed: $$rc"; echo
 
 testdrivers: $(TSTFILES)
 
 regtests: regtestdrivers
-       -@rc=0; count=0; for file in $(REGFILES); do echo " RTST        $$file"; ./$$file; rc=`expr $$rc + $$?`; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking system libc): $$count  Tests failed: $$rc"
+       -@rc=0; count=0; echo; for file in $(REGFILES); do echo " RTST  $$file"; ./$$file; rc=`expr $$rc + $$?`; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking system libc): $$count  Tests failed: $$rc"; echo
 
 regtestdrivers: $(REGFILES)
 
@@ -83,6 +88,7 @@ help:
        @echo "all              - build pdclib.a"
        @echo "clean            - remove all object files, dependency files and test drivers"
        @echo "dist             - build pdclib.tgz (source tarball)"
+       @echo "test             - test a single testdriver (Usage: FILE=\"test.[rt]\" make test)"
        @echo "tests            - build and run test drivers (link pdclib.a)"
        @echo "  testdrivers    - build but do not run test drivers"
        @echo "regtests         - build and run regression test drivers (link system clib)"
@@ -98,13 +104,13 @@ help:
        @echo "help             - print this list"
 
 %.o: %.c Makefile
-       @echo " CC      $@"
+       @echo " CC      $(patsubst functions/%,%,$@)"
        @$(CC) $(CFLAGS) -DNDEBUG -MMD -MP -MT "$*.d $*.t" -g -std=c99 -I./includes -I./internals -c $< -o $@
 
 %.t: %.c Makefile pdclib.a
-       @echo " CC      $@"
+       @echo " CC      $(patsubst functions/%,%,$@)"
        @$(CC) $(CFLAGS) -DTEST -std=c99 -I./includes -I./internals $< pdclib.a -o $@
 
 %.r: %.c Makefile
-       @echo " CC      $@"
+       @echo " CC      $(patsubst functions/%,%,$@)"
        @$(CC) $(CFLAGS) -DTEST -DREGTEST -std=c99 -I./internals $< -o $@