simplify TESTDIR setting and touchup

diff --git a/test/args/Makefile b/test/args/Makefile
index dd5339a..60c6968 100644 (file)
--- a/test/args/Makefile
+++ b/test/args/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=arg_test
 all: $(TARGETS)
@@ -36,5 +34,3 @@ arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak
 
 clean:
        $(RM) *.[oa] *~ core $(TARGETS)
-
-

diff --git a/test/assert/Makefile b/test/assert/Makefile
index 3771224..15430ec 100644 (file)
--- a/test/assert/Makefile
+++ b/test/assert/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=assert
 all: $(TARGETS)
@@ -36,5 +34,3 @@ assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak
 
 clean:
        $(RM) *.[oa] *~ core $(TARGETS)
-
-

diff --git a/test/crypt/Makefile b/test/crypt/Makefile
index 4d5e125..b0cd589 100644 (file)
--- a/test/crypt/Makefile
+++ b/test/crypt/Makefile
@@ -16,10 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-
-
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
 
 TARGETS=crypt md5c-test
 EXTRA_LIBS=-lcrypt

diff --git a/test/ctype/Makefile b/test/ctype/Makefile
index 37d0551..750f9c6 100644 (file)
--- a/test/ctype/Makefile
+++ b/test/ctype/Makefile
@@ -16,8 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
 
 TARGETS=ctype ctype_run
 all: $(TARGETS)

diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile
index 98a48d4..4ed5660 100644 (file)
--- a/test/dlopen/Makefile
+++ b/test/dlopen/Makefile
@@ -15,10 +15,9 @@
 # You should have received a copy of the GNU Library General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# Makefile for uClibc
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
+
 DEBUG_LIBS=X
 #DEBUG_LIBS=LD_DEBUG
 

diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index 714eade..4d8f9b4 100644 (file)
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=malloc
 TARGETS+=testmalloc testmalloc_glibc 

diff --git a/test/math/Makefile b/test/math/Makefile
index 6eb554c..e43b185 100644 (file)
--- a/test/math/Makefile
+++ b/test/math/Makefile
@@ -16,10 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+include ../Rules.mak
 
-
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
 CFLAGS+=-D_GNU_SOURCE -DNO_LONG_DOUBLE
 EXTRA_LIBS=-lm
 PERL=/usr/bin/perl

diff --git a/test/misc/Makefile b/test/misc/Makefile
index 65e2750..10199d9 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -16,8 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
 
 CFLAGS64=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 

diff --git a/test/mmap/Makefile b/test/mmap/Makefile
index 5e71332..ce786c9 100644 (file)
--- a/test/mmap/Makefile
+++ b/test/mmap/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=mmap
 all: $(TARGETS)

diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index 247c078..fb69640 100644 (file)
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -1,5 +1,22 @@
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+# Makefile for uClibc
+#
+# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Library General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option) any
+# later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+include ../Rules.mak
 
 LDFLAGS += 
 #EXTRA_LIBS += -lc -lgcc -lpthread

diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile
index fdfb1d8..d12cecb 100644 (file)
--- a/test/pwd_grp/Makefile
+++ b/test/pwd_grp/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=test_pwd test_pwd_glibc
 TARGETS+=test_grp test_grp_glibc

diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile
index 83e9a88..46f98f3 100644 (file)
--- a/test/setjmp/Makefile
+++ b/test/setjmp/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=setjmp_test
 all: $(TARGETS)

diff --git a/test/signal/Makefile b/test/signal/Makefile
index f193b16..cf3144c 100644 (file)
--- a/test/signal/Makefile
+++ b/test/signal/Makefile
@@ -16,8 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
 
 CFLAGS += -D_GNU_SOURCE
 

diff --git a/test/silly/Makefile b/test/silly/Makefile
index f9d4a1d..7207b15 100644 (file)
--- a/test/silly/Makefile
+++ b/test/silly/Makefile
@@ -16,10 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
 
 TARGETS=hello_source hello hello_glibc tiny
 

diff --git a/test/stat/Makefile b/test/stat/Makefile
index 0b6b3c6..5c8e5e1 100644 (file)
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -16,8 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
 
 CFLAGS64=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 

diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 49a321a..87199ed 100644 (file)
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -16,10 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
 
 TARGETS+=teststrtol teststrtol_glibc teststrtol_diff
 TARGETS+=qsort qsort_glibc qsort_diff

diff --git a/test/string/Makefile b/test/string/Makefile
index b55788f..1d28c08 100644 (file)
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -16,9 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
 
 TARGETS=string string_glibc
 TARGETS+=testcopy testcopy_glibc

diff --git a/test/termios/Makefile b/test/termios/Makefile
index 22868f4..de52c61 100644 (file)
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -16,10 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
 
 TARGETS=termios termios_glibc
 

diff --git a/test/unistd/Makefile b/test/unistd/Makefile
index b4185c4..ff0bd80 100644 (file)
--- a/test/unistd/Makefile
+++ b/test/unistd/Makefile
@@ -16,10 +16,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
 
 TARGETS=fork fork_glibc vfork vfork_glibc getcwd getopt getopt_long preadwrite 
 all: $(TARGETS)