diff options
| -rw-r--r-- | test/Makefile | 19 | ||||
| -rw-r--r-- | test/Rules.mak | 13 |
2 files changed, 12 insertions, 20 deletions
diff --git a/test/Makefile b/test/Makefile index 51fcde843..9b12cdc4d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,23 +1,12 @@ # Makefile for uClibc # -# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2005 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. +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -# 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 -TOPDIR=../ --include $(TOPDIR).config +top_builddir=../ +-include $(top_builddir).config .EXPORT_ALL_VARIABLES: diff --git a/test/Rules.mak b/test/Rules.mak index 8f3167c71..dfd2d4f61 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -1,14 +1,17 @@ # Rules.mak for uClibc test subdirs # # Copyright (C) 2001 by Lineo, inc. +# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # # Note: This does not read the top level Rules.mak file # -TOPDIR = ../../ -TESTDIR=$(TOPDIR)test/ +top_builddir = ../../ +TESTDIR=$(top_builddir)test/ --include $(TOPDIR).config +-include $(top_builddir).config ifndef UCLIBC_LDSO UCLIBC_LDSO := ld-uClibc.so.0 @@ -51,7 +54,7 @@ CC = $(CROSS)gcc STRIPTOOL = strip RM = rm -f ifeq ($(LDSO_LDD_SUPPORT),y) -LDD = $(TOPDIR)utils/ldd +LDD = $(top_builddir)utils/ldd else LDD = @true endif @@ -99,5 +102,5 @@ ifneq ($(strip $(HAVE_SHARED)),y) LDFLAGS += -static GLIBC_LDFLAGS += -static else - LDFLAGS += -Wl,-dynamic-linker,$(TOPDIR)lib/$(UCLIBC_LDSO) + LDFLAGS += -Wl,-dynamic-linker,$(top_builddir)lib/$(UCLIBC_LDSO) endif |