diff options
| author | dfr <dfr@FreeBSD.org> | 2004-08-16 09:35:49 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2004-08-16 09:35:49 +0000 |
| commit | 597fea43c03116bda26e0dff296436350980b2df (patch) | |
| tree | 8fc9ea79e973d0a91eefec3ea0598e217562dd1d /tools | |
| parent | 2f36723c3d87eb1255bba04d4479818e08f8e487 (diff) | |
| download | FreeBSD-src-597fea43c03116bda26e0dff296436350980b2df.zip FreeBSD-src-597fea43c03116bda26e0dff296436350980b2df.tar.gz | |
Remove some debug cruft from the Makefiles and make them ${.OBJDIR}
friendly.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/regression/tls/ttls1/Makefile | 7 | ||||
| -rw-r--r-- | tools/regression/tls/ttls2/Makefile | 6 | ||||
| -rw-r--r-- | tools/regression/tls/ttls3/Makefile | 12 |
3 files changed, 8 insertions, 17 deletions
diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile index ef451b7..86ed613 100644 --- a/tools/regression/tls/ttls1/Makefile +++ b/tools/regression/tls/ttls1/Makefile @@ -1,11 +1,8 @@ # $FreeBSD$ PROG= ttls1 -LDADD+= -L../libxx -lxx -Wl,--rpath=${.CURDIR}/../libxx -LDADD+= -L../libyy -lyy -Wl,--rpath=${.CURDIR}/../libyy -LDADD+= -L${.CURDIR}/../../../../lib/libc -lc -LDADD+= -Wl,--rpath=${.CURDIR}/../../../../lib/libc -LDADD+= -Wl,--dynamic-linker=${.CURDIR}/../../../../libexec/rtld-elf/ld-elf.so.1 +LDADD+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx +LDADD+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy NOMAN= t DEBUG_FLAGS= -g diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile index 584bf42..63b5d07 100644 --- a/tools/regression/tls/ttls2/Makefile +++ b/tools/regression/tls/ttls2/Makefile @@ -2,12 +2,6 @@ PROG= ttls2 LDADD+= -lpthread -LDADD+= -Wl,--rpath=${.CURDIR}/../../../../lib/libpthread -#LDADD+= -lthr -#LDADD+= -Wl,--rpath=${.CURDIR}/../../../../lib/libthr -LDADD+= -L${.CURDIR}/../../../../lib/libc -lc -LDADD+= -Wl,--rpath=${.CURDIR}/../../../../lib/libc -LDADD+= -Wl,--dynamic-linker=${.CURDIR}/../../../../libexec/rtld-elf/ld-elf.so.1 NOMAN= t DEBUG_FLAGS= -g diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile index fece4cb..b171181 100644 --- a/tools/regression/tls/ttls3/Makefile +++ b/tools/regression/tls/ttls3/Makefile @@ -3,22 +3,22 @@ all: ttls3 LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined -CFLAGS+= -L${.CURDIR}/../../../../lib/libc -lc -lthr -CFLAGS+= -Wl,--rpath=${.CURDIR}/../../../../lib/libc +CFLAGS+= -lpthread CFLAGS+= -Wl,--rpath=${.OBJDIR} -CFLAGS+= -Wl,--dynamic-linker=${.CURDIR}/../../../../libexec/rtld-elf/ld-elf.so.1 tls-lib: elftls.S - gcc -c -o elftls.o elftls.S + gcc -c -o elftls.o ${.CURDIR}/elftls.S ld $(LDFLAGS) elftls.o -soname libtls.so.1 -o libtls.so.1 ln -sf libtls.so.1 libtls.so tls-test-lib: tls-lib tls-test-lib.c - gcc -c -o tls-test.o tls-test-lib.c + gcc -c -o tls-test.o ${.CURDIR}/tls-test-lib.c ld $(LDFLAGS) tls-test.o libtls.so.1 -rpath=${.OBJDIR} -soname libtls-test.so.1 -o libtls-test.so.1 ttls3: tls-test-lib tls-test.c - gcc $(CFLAGS) -rdynamic -o ttls3 tls-test.c + gcc $(CFLAGS) -rdynamic -o ttls3 ${.CURDIR}/tls-test.c clean: rm -f *.o libtls.so* libtls-test.so* ttls3 + +.include <bsd.obj.mk> |
