From 844b89dbfdd41ced4666d2bb99ce0bf99503524b Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 20 Jan 2001 00:45:14 +0000
Subject: 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
---
 test/string/Makefile | 56 ++++++++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 37 deletions(-)

(limited to 'test/string')

diff --git a/test/string/Makefile b/test/string/Makefile
index 3277334ab..0c3af9e03 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -1,23 +1,5 @@
-TOPDIR=../../
-include $(TOPDIR)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
-STRIPTOOL=/bin/true
-
-
-XCFLAGS = -Wall -g -fno-builtin -nostdinc \
-	-I$(TOPDIR)include -I/usr/include/linux
-XLDFLAGS = -nostdlib -gc-sections
-EXTRA_LIBS=$(TOPDIR)libc.a -lgcc
-
-YCFLAGS = -Wall -Os -fomit-frame-pointer
-YLDFLAGS = -s --static 
+TESTDIR=../
+include $(TESTDIR)/Rules.mak
 
 
 TARGETS=string string_glibc
@@ -26,46 +8,46 @@ TARGETS+=strerror strsignal
 
 all: $(TARGETS)
 
-string: string.c Makefile $(TOPDIR)libc.a
+string: string.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 $@
 	-./$@
 	-@ echo " "
 
-string_glibc: string.c Makefile $(TOPDIR)libc.a
+string_glibc: string.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 $@
 	-./$@
 	-@ echo " "
 
-testcopy: testcopy.c Makefile $(TOPDIR)libc.a
+testcopy: testcopy.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 $@
 	-./$@ > testcopy.out
 	-@ echo " "
 
-testcopy_glibc: testcopy.c Makefile $(TOPDIR)libc.a
+testcopy_glibc: testcopy.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 $@
 	-./$@ > testcopy.gnu.out
 	-@ echo " "
@@ -79,13 +61,13 @@ testcopy_diff: testcopy testcopy_glibc
 	-@ echo " "
 
 
-strerror: ../../string/strerror.c
+strerror: ../../string/strerror.c $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo "-------"
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(CC) $(XCFLAGS) -DCHECK_BUF -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(TESTCC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
+	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@
 	-@ echo " "
@@ -95,8 +77,8 @@ strsignal: ../../string/strsignal.c
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(CC) $(XCFLAGS) -DCHECK_BUF -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(CC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
+	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@
 	-@ echo " "
-- 
cgit v1.2.3