From 9fd69f37d28cfd7438cac3eeb45fe9dd46b4d7dd Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 25 Feb 2010 14:42:26 +0000 Subject: [PATCH] Fixed missing or broken library dependencies. --- share/mk/bsd.libnames.mk | 2 ++ tools/regression/file/closefrom/Makefile | 2 +- tools/regression/file/flock/Makefile | 4 ++-- tools/regression/gaithrstress/Makefile | 3 ++- tools/regression/kgssapi/Makefile | 1 + tools/regression/mqueue/mqtest1/Makefile | 3 ++- tools/regression/mqueue/mqtest2/Makefile | 3 ++- tools/regression/mqueue/mqtest3/Makefile | 3 ++- tools/regression/mqueue/mqtest4/Makefile | 3 ++- tools/regression/mqueue/mqtest5/Makefile | 3 ++- tools/regression/netipx/ipxdgramloopback/Makefile | 2 +- tools/regression/netipx/spxabort/Makefile | 2 +- tools/regression/netipx/spxloopback/Makefile | 2 +- tools/regression/pthread/cv_cancel1/Makefile | 2 +- tools/regression/pthread/mutex_isowned_np/Makefile | 2 +- tools/regression/rpcsec_gss/Makefile | 1 + tools/regression/sigqueue/sigqtest1/Makefile | 1 - tools/regression/sigqueue/sigqtest2/Makefile | 1 - tools/regression/sockets/sendfile/Makefile | 3 ++- tools/regression/tls/libxx/Makefile | 3 +-- tools/regression/tls/libyy/Makefile | 3 +-- tools/regression/tls/ttls1/Makefile | 4 ++-- tools/regression/tls/ttls2/Makefile | 3 ++- tools/regression/tls/ttls4/Makefile | 3 ++- tools/tools/ether_reflect/Makefile | 4 ++-- tools/tools/net80211/stumbler/Makefile | 2 +- tools/tools/net80211/w00t/Makefile.inc | 3 ++- 27 files changed, 39 insertions(+), 29 deletions(-) diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index ab2a872baa2f..c80fe2342796 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -135,6 +135,8 @@ LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a +LIBRPCSEC_GSS?= ${DESTDIR}${LIBDIR}/librpcsec_gss.a +LIBRT?= ${DESTDIR}${LIBDIR}/librt.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a diff --git a/tools/regression/file/closefrom/Makefile b/tools/regression/file/closefrom/Makefile index 7ff2df81ee76..4b8829c78484 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 diff --git a/tools/regression/file/flock/Makefile b/tools/regression/file/flock/Makefile index f3522a54dac2..1c9e6cca4244 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 diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile index 2506e017a3bd..f3b8b004fd84 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 diff --git a/tools/regression/kgssapi/Makefile b/tools/regression/kgssapi/Makefile index 49059fa9d670..e033e28db481 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 4e04d1d2ad9c..370b5c9bd35a 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 9d1b92c39887..07a5577d4ec4 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 d4ea9fa08691..543948041b07 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 3dfec4d6481e..d0476b27476e 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 25f46adf1e4f..b2f3aad69815 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 364d787e46b7..78b3e4528989 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 b9498a07c659..ec3ef5b26fd6 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 edbfbbc5bdd3..4245217a2aca 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 6fe38c76d86c..bb238255f93c 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 diff --git a/tools/regression/pthread/mutex_isowned_np/Makefile b/tools/regression/pthread/mutex_isowned_np/Makefile index d7d3ac47ca7a..a234fbc5eb6e 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 diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile index 29b14d6e332e..d1f894bfea17 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 08a140c5c894..86f7206cc009 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 b3899ad833f9..e7033f7b21e0 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 5791427d544b..2930363820a9 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 diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile index bc9393b538e0..cf4e68069f23 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 8b45b99a29ca..b7a7198cb319 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 d3b6e6521412..f4da549c7e51 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 0a3bc95912e8..043b9cad15a2 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 5fb37df580fe..9a38a58e6343 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 diff --git a/tools/tools/ether_reflect/Makefile b/tools/tools/ether_reflect/Makefile index e3cf2667868e..822643bf497d 100644 --- a/tools/tools/ether_reflect/Makefile +++ b/tools/tools/ether_reflect/Makefile @@ -4,7 +4,7 @@ # A Makefile that builds both the ether_reflect program and its manual page. PROG= ether_reflect - -LDADD+= -lpcap +DPADD= ${LIBPCAP} +LDADD= -lpcap .include diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile index 69abea7394bc..d7236afe95b0 100644 --- a/tools/tools/net80211/stumbler/Makefile +++ b/tools/tools/net80211/stumbler/Makefile @@ -2,7 +2,7 @@ PROG= stumbler BINDIR= /usr/local/bin -DPADD= ${LIBPCAP} +DPADD= ${LIBPCAP} ${LIBNCURSES} LDADD= -lpcap -lncurses CFLAGS=-g NO_MAN= diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc index 0670300a62e2..ecf5517ac524 100644 --- a/tools/tools/net80211/w00t/Makefile.inc +++ b/tools/tools/net80211/w00t/Makefile.inc @@ -3,7 +3,8 @@ W00T= ../libw00t # NB: we get crc32 from -lz DPADD= ${W00T}/libw00t.a ${LIBCRYPTO} ${LIBZ} -LDADD= -L${W00T} -lw00t -lcrypto -lz +LDFLAGS= -L${W00T} +LDADD= -lw00t -lcrypto -lz BINDIR= /usr/local/bin CFLAGS= -g -I${W00T}