Reworked all test suite makefiles (man did they need it).

Refactored testsuite.h so it behaves the way I want it to.  As policy now,
all test apps are _supposed_ to use testsuite.h (not all have been converted
to do this yet).  It is simple, clean, and works.
 -Erik

1 files changed, 20 insertions, 31 deletions

diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 3d9666865..1a054fbe3 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -1,17 +1,6 @@
-TOPDIR=../../
-include $(TOPDIR)Rules.mak
+TESTDIR=../
+include $(TESTDIR)/Rules.mak
 
-# Check if 'ls -sh' works or not 
-LSFLAGS = $(shell if ls -sh >/dev/null 2>&1; \
-    then echo "-sh"; else echo "-s" ; fi)
-
-XCFLAGS = -Wall -Os -fomit-frame-pointer -fno-builtin -nostdinc \
-	-I$(TOPDIR)include -I/usr/include/linux
-XLDFLAGS = -nostdlib -s -gc-sections
-EXTRA_LIBS=$(TOPDIR)libc.a -lgcc
-
-YCFLAGS = -Wall -Os -fomit-frame-pointer
-YLDFLAGS = -s --static 
 
 
 TARGETS=testmalloc testmalloc_glibc 
@@ -27,52 +16,52 @@ testmalloc_source:
 	-@ cat testmalloc.c
 	-@ echo " "
 
-testmalloc: testmalloc.c Makefile $(TOPDIR)libc.a
+testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
 	ls $(LSFLAGS) $@
 	-./$@
 	-@ echo " "
 
-testmalloc_glibc: testmalloc.c Makefile $(TOPDIR)libc.a
+testmalloc_glibc: testmalloc.c Makefile
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs GNU libc: "
 	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
+	$(CC) $(CFLAGS) -c $< -o $@.o
+	$(CC) $(LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
 	ls $(LSFLAGS) $@
 	-./$@
 	-@ echo " "
 
-mallocbug: mallocbug.c Makefile $(TOPDIR)libc.a
+mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs uC-Libc: "
 	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
 	ls $(LSFLAGS) $@
 	-./$@
 	-@ echo " "
 
-mallocbug_glibc: mallocbug.c Makefile $(TOPDIR)libc.a
+mallocbug_glibc: mallocbug.c Makefile
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs GNU libc: "
 	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
+	$(CC) $(CFLAGS) -c $< -o $@.o
+	$(CC) $(LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
 	ls $(LSFLAGS) $@
@@ -86,26 +75,26 @@ teststrtol_source:
 	-@ cat teststrtol.c
 	-@ echo " "
 
-teststrtol: teststrtol.c Makefile $(TOPDIR)libc.a
+teststrtol: teststrtol.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs uC-Libc: "
 	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
 	ls -sh $@
 	-./$@ > $@.out
 	-@ echo " "
 
-teststrtol_glibc: teststrtol.c Makefile $(TOPDIR)libc.a
+teststrtol_glibc: teststrtol.c Makefile
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs GNU libc: "
 	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
+	$(CC) $(CFLAGS) -c $< -o $@.o
+	$(CC) $(LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
 	ls -sh $@