From 6bfb450b58b778825e2c593c929b8ad4b8e294fb Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 23 Feb 2013 10:22:56 +0100 Subject: test: add missing top_srcdir Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 7 ++++--- Rules.mak | 2 +- test/API/Makefile | 1 + test/Makefile | 1 + test/args/Makefile | 1 + test/assert/Makefile | 1 + test/build/Makefile | 1 + test/crypt/Makefile | 1 + test/ctype/Makefile | 1 + test/dlopen/Makefile | 1 + test/inet/Makefile | 1 + test/librt/Makefile | 1 + test/locale-mbwc/Makefile | 1 + test/locale/Makefile | 1 + test/malloc/Makefile | 1 + test/math/Makefile | 1 + test/misc/Makefile | 1 + test/mmap/Makefile | 1 + test/pthread/Makefile | 1 + test/pwd_grp/Makefile | 1 + test/regex/Makefile | 1 + test/rpc/Makefile | 1 + test/setjmp/Makefile | 1 + test/signal/Makefile | 1 + test/silly/Makefile | 1 + test/stat/Makefile | 1 + test/stdio/Makefile | 1 + test/stdlib/Makefile | 1 + test/string/Makefile | 1 + test/termios/Makefile | 1 + test/time/Makefile | 1 + test/unistd/Makefile | 1 + 32 files changed, 35 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 80c70994b..5d0f87d49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,7 +196,8 @@ $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscal .PHONY: $(LOCAL_INSTALL_PATH) $(LOCAL_INSTALL_PATH): - $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \ + $(Q)$(MAKE) PREFIX=$(LOCAL_INSTALL_PATH) \ + RUNTIME_PREFIX=/ \ DEVEL_PREFIX=/usr/ \ HOSTCC="$(HOSTCC)" \ install @@ -512,7 +513,7 @@ dist release: du -b ../uClibc-$(VERSION).tar.{bz2,xz} test check: test_compile - $(Q)$(MAKE) -C test + $(Q)$(MAKE) -C test $(if $(O),top_builddir=$(O)/) test_compile: $(LOCAL_INSTALL_PATH) - $(Q)$(MAKE) -C test compile + $(Q)$(MAKE) -C test compile $(if $(O),top_builddir=$(O)/) diff --git a/Rules.mak b/Rules.mak index 751c2fea2..a602b4fdd 100644 --- a/Rules.mak +++ b/Rules.mak @@ -837,6 +837,6 @@ SHARED_START_FILES:=$(top_builddir)lib/crti.o $(LIBGCC_DIR)crtbeginS.o SHARED_END_FILES:=$(LIBGCC_DIR)crtendS.o $(top_builddir)lib/crtn.o endif -LOCAL_INSTALL_PATH := install_dir +LOCAL_INSTALL_PATH := $(if $(O),$(O)/)install_dir PTHREAD_GENERATE_MANGLE ?= -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*\$$/\#define \1 \2/p" diff --git a/test/API/Makefile b/test/API/Makefile index 458d6c53f..2384e2a98 100644 --- a/test/API/Makefile +++ b/test/API/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/Makefile b/test/Makefile index e34c2953b..0c7b9151d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,6 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # +top_srcdir=../ top_builddir=../ include Rules.mak diff --git a/test/args/Makefile b/test/args/Makefile index 67ee452aa..0ae3f010b 100644 --- a/test/args/Makefile +++ b/test/args/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/assert/Makefile b/test/assert/Makefile index 691325418..841a4dace 100644 --- a/test/assert/Makefile +++ b/test/assert/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/build/Makefile b/test/build/Makefile index 99a64d517..ce74a8a7a 100644 --- a/test/build/Makefile +++ b/test/build/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/crypt/Makefile b/test/crypt/Makefile index 44bbde03a..25b0f3c86 100644 --- a/test/crypt/Makefile +++ b/test/crypt/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/ctype/Makefile b/test/ctype/Makefile index fd72584cb..99dbdbc9c 100644 --- a/test/ctype/Makefile +++ b/test/ctype/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile index ef15d861d..d5be53c6a 100644 --- a/test/dlopen/Makefile +++ b/test/dlopen/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/inet/Makefile b/test/inet/Makefile index 9605dca66..b294ea6b5 100644 --- a/test/inet/Makefile +++ b/test/inet/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/librt/Makefile b/test/librt/Makefile index 354c6811e..1021afe9c 100644 --- a/test/librt/Makefile +++ b/test/librt/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/locale-mbwc/Makefile b/test/locale-mbwc/Makefile index 771c3d117..263f325b9 100644 --- a/test/locale-mbwc/Makefile +++ b/test/locale-mbwc/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/locale/Makefile b/test/locale/Makefile index 771c3d117..263f325b9 100644 --- a/test/locale/Makefile +++ b/test/locale/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/malloc/Makefile b/test/malloc/Makefile index d76f07b1e..97c424be6 100644 --- a/test/malloc/Makefile +++ b/test/malloc/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/math/Makefile b/test/math/Makefile index 135aedb2b..6194efa07 100644 --- a/test/math/Makefile +++ b/test/math/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/misc/Makefile b/test/misc/Makefile index 52f6c679b..09fa233a6 100644 --- a/test/misc/Makefile +++ b/test/misc/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/mmap/Makefile b/test/mmap/Makefile index 64b652de6..89e7195fb 100644 --- a/test/mmap/Makefile +++ b/test/mmap/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/pthread/Makefile b/test/pthread/Makefile index d6f00d643..97ebee894 100644 --- a/test/pthread/Makefile +++ b/test/pthread/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile index 21070f4cb..fa2aacb8e 100644 --- a/test/pwd_grp/Makefile +++ b/test/pwd_grp/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/regex/Makefile b/test/regex/Makefile index 639122211..eea0c491b 100644 --- a/test/regex/Makefile +++ b/test/regex/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/rpc/Makefile b/test/rpc/Makefile index 47accc62e..e098072fc 100644 --- a/test/rpc/Makefile +++ b/test/rpc/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile index a26e2d571..6feab59ef 100644 --- a/test/setjmp/Makefile +++ b/test/setjmp/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/signal/Makefile b/test/signal/Makefile index e8293658d..c2afb5f50 100644 --- a/test/signal/Makefile +++ b/test/signal/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/silly/Makefile b/test/silly/Makefile index 4db1850d8..54f4bd023 100644 --- a/test/silly/Makefile +++ b/test/silly/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/stat/Makefile b/test/stat/Makefile index ecde416d1..03fdb960a 100644 --- a/test/stat/Makefile +++ b/test/stat/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/stdio/Makefile b/test/stdio/Makefile index a5d662a7c..95b930b9d 100644 --- a/test/stdio/Makefile +++ b/test/stdio/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile index f8a40384b..567e0e37a 100644 --- a/test/stdlib/Makefile +++ b/test/stdlib/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/string/Makefile b/test/string/Makefile index 62c82695a..8948a50e3 100644 --- a/test/string/Makefile +++ b/test/string/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/termios/Makefile b/test/termios/Makefile index 926e05219..098cca6e0 100644 --- a/test/termios/Makefile +++ b/test/termios/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/time/Makefile b/test/time/Makefile index 103acb885..fed45697b 100644 --- a/test/time/Makefile +++ b/test/time/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak diff --git a/test/unistd/Makefile b/test/unistd/Makefile index 0dbd52e94..796d7ccea 100644 --- a/test/unistd/Makefile +++ b/test/unistd/Makefile @@ -2,6 +2,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. top_builddir=../../ +top_srcdir=../../ include ../Rules.mak -include Makefile.in include ../Test.mak -- cgit v1.2.3