simplify TESTDIR setting and touchup

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)
-
-

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)
-
-

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

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)

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
 

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 

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

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
 

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)

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

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

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)

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
 

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
 

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
 

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

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

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
 

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)