diff options
author | ru <ru@FreeBSD.org> | 2010-02-25 14:42:26 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2010-02-25 14:42:26 +0000 |
commit | 4af3a7a23ff67d621a71f1a73ff8ea3f892a07d9 (patch) | |
tree | da9a6fd2c1fc08cf833e2f0870883f23013365e8 /tools/regression | |
parent | a7d34933344bc3694ee29ba02e0e388dbd855ca9 (diff) | |
download | FreeBSD-src-4af3a7a23ff67d621a71f1a73ff8ea3f892a07d9.zip FreeBSD-src-4af3a7a23ff67d621a71f1a73ff8ea3f892a07d9.tar.gz |
Fixed missing or broken library dependencies.
Diffstat (limited to 'tools/regression')
23 files changed, 32 insertions, 25 deletions
diff --git a/tools/regression/file/closefrom/Makefile b/tools/regression/file/closefrom/Makefile index 7ff2df8..4b8829c 100644 --- a/tools/regression/file/closefrom/Makefile +++ b/tools/regression/file/closefrom/Makefile @@ -3,7 +3,7 @@ PROG= closefrom MAN= WARNS?= 6 - +DPADD= ${LIBUTIL} LDADD= -lutil .include <bsd.prog.mk> diff --git a/tools/regression/file/flock/Makefile b/tools/regression/file/flock/Makefile index f3522a5..1c9e6cc 100644 --- a/tools/regression/file/flock/Makefile +++ b/tools/regression/file/flock/Makefile @@ -3,7 +3,7 @@ PROG= flock NO_MAN= WARNS?= 6 - -LDADD+= -lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread .include <bsd.prog.mk> diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile index 2506e01..f3b8b00 100644 --- a/tools/regression/gaithrstress/Makefile +++ b/tools/regression/gaithrstress/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= gaithrstress -LDADD+= -pthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/kgssapi/Makefile b/tools/regression/kgssapi/Makefile index 49059fa..e033e28 100644 --- a/tools/regression/kgssapi/Makefile +++ b/tools/regression/kgssapi/Makefile @@ -3,6 +3,7 @@ PROG= gsstest NO_MAN= WARNS?= 2 +DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5} LDADD= -lgssapi -lgssapi_krb5 DEBUG_FLAGS= -g -O0 diff --git a/tools/regression/mqueue/mqtest1/Makefile b/tools/regression/mqueue/mqtest1/Makefile index 4e04d1d..370b5c9 100644 --- a/tools/regression/mqueue/mqtest1/Makefile +++ b/tools/regression/mqueue/mqtest1/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest1 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/mqueue/mqtest2/Makefile b/tools/regression/mqueue/mqtest2/Makefile index 9d1b92c..07a5577 100644 --- a/tools/regression/mqueue/mqtest2/Makefile +++ b/tools/regression/mqueue/mqtest2/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest2 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/mqueue/mqtest3/Makefile b/tools/regression/mqueue/mqtest3/Makefile index d4ea9fa..5439480 100644 --- a/tools/regression/mqueue/mqtest3/Makefile +++ b/tools/regression/mqueue/mqtest3/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest3 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/mqueue/mqtest4/Makefile b/tools/regression/mqueue/mqtest4/Makefile index 3dfec4d..d0476b2 100644 --- a/tools/regression/mqueue/mqtest4/Makefile +++ b/tools/regression/mqueue/mqtest4/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest4 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/mqueue/mqtest5/Makefile b/tools/regression/mqueue/mqtest5/Makefile index 25f46ad..b2f3aad 100644 --- a/tools/regression/mqueue/mqtest5/Makefile +++ b/tools/regression/mqueue/mqtest5/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest5 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/netipx/ipxdgramloopback/Makefile b/tools/regression/netipx/ipxdgramloopback/Makefile index 364d787..78b3e45 100644 --- a/tools/regression/netipx/ipxdgramloopback/Makefile +++ b/tools/regression/netipx/ipxdgramloopback/Makefile @@ -5,7 +5,7 @@ PROG= ipxdgramloopback NO_MAN= -DPADD= ${LIBIPX}; +DPADD= ${LIBIPX} LDADD= -lipx WARNS?= 3 diff --git a/tools/regression/netipx/spxabort/Makefile b/tools/regression/netipx/spxabort/Makefile index b9498a0..ec3ef5b 100644 --- a/tools/regression/netipx/spxabort/Makefile +++ b/tools/regression/netipx/spxabort/Makefile @@ -5,7 +5,7 @@ PROG= spxabort NO_MAN= -DPADD= ${LIBIPX}; +DPADD= ${LIBIPX} LDADD= -lipx WARNS?= 3 diff --git a/tools/regression/netipx/spxloopback/Makefile b/tools/regression/netipx/spxloopback/Makefile index edbfbbc..4245217 100644 --- a/tools/regression/netipx/spxloopback/Makefile +++ b/tools/regression/netipx/spxloopback/Makefile @@ -5,7 +5,7 @@ PROG= spxloopback NO_MAN= -DPADD= ${LIBIPX}; +DPADD= ${LIBIPX} LDADD= -lipx WARNS?= 3 diff --git a/tools/regression/pthread/cv_cancel1/Makefile b/tools/regression/pthread/cv_cancel1/Makefile index 6fe38c7..bb23825 100644 --- a/tools/regression/pthread/cv_cancel1/Makefile +++ b/tools/regression/pthread/cv_cancel1/Makefile @@ -2,7 +2,7 @@ PROG= cv_cancel1 NO_MAN= - +DPADD= ${LIBPTHREAD} LDADD= -lpthread .include <bsd.prog.mk> diff --git a/tools/regression/pthread/mutex_isowned_np/Makefile b/tools/regression/pthread/mutex_isowned_np/Makefile index d7d3ac4..a234fbc 100644 --- a/tools/regression/pthread/mutex_isowned_np/Makefile +++ b/tools/regression/pthread/mutex_isowned_np/Makefile @@ -2,7 +2,7 @@ PROG= mutex_isowned_np NO_MAN= - +DPADD= ${LIBPTHREAD} LDADD= -lpthread .include <bsd.prog.mk> diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile index 29b14d6..d1f894b 100644 --- a/tools/regression/rpcsec_gss/Makefile +++ b/tools/regression/rpcsec_gss/Makefile @@ -3,6 +3,7 @@ PROG= rpctest NO_MAN= WARNS?= 6 +DPADD= ${LIBRPCSEC_GSS} LDADD= -lrpcsec_gss DEBUG_FLAGS= -g -O0 diff --git a/tools/regression/sigqueue/sigqtest1/Makefile b/tools/regression/sigqueue/sigqtest1/Makefile index 08a140c..86f7206 100644 --- a/tools/regression/sigqueue/sigqtest1/Makefile +++ b/tools/regression/sigqueue/sigqtest1/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG=sigqtest1 -LDADD+= NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/sigqueue/sigqtest2/Makefile b/tools/regression/sigqueue/sigqtest2/Makefile index b3899ad..e7033f7 100644 --- a/tools/regression/sigqueue/sigqtest2/Makefile +++ b/tools/regression/sigqueue/sigqtest2/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG=sigqtest2 -LDADD+= NO_MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile index 5791427..2930363 100644 --- a/tools/regression/sockets/sendfile/Makefile +++ b/tools/regression/sockets/sendfile/Makefile @@ -5,6 +5,7 @@ PROG= sendfile NO_MAN= WARNS?= 6 -LDADD = -lmd +DPADD= ${LIBMD} +LDADD= -lmd .include <bsd.prog.mk> diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile index bc9393b..cf4e680 100644 --- a/tools/regression/tls/libxx/Makefile +++ b/tools/regression/tls/libxx/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ -LIB= xx -SHLIB_MAJOR= 1 +SHLIB_NAME= libxx.so SRCS= xx.c #CFLAGS+=-mtls-dialect=sun diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile index 8b45b99..b7a7198 100644 --- a/tools/regression/tls/libyy/Makefile +++ b/tools/regression/tls/libyy/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ -LIB= yy -SHLIB_MAJOR= 1 +SHLIB_NAME= libyy.so SRCS= yy.c CFLAGS+=-fpic diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile index d3b6e65..f4da549 100644 --- a/tools/regression/tls/ttls1/Makefile +++ b/tools/regression/tls/ttls1/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= ttls1 -LDADD+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx -LDADD+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy +LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx +LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy NO_MAN= DEBUG_FLAGS= -g diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile index 0a3bc95..043b9ca 100644 --- a/tools/regression/tls/ttls2/Makefile +++ b/tools/regression/tls/ttls2/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= ttls2 -LDADD+= -lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread NO_MAN= DEBUG_FLAGS= -g diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile index 5fb37df..9a38a58 100644 --- a/tools/regression/tls/ttls4/Makefile +++ b/tools/regression/tls/ttls4/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= ttls4 -LDADD+= -lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread NO_MAN= DEBUG_FLAGS= -g |