Convert contrib/ofed libraries to LIBADD.

Sponsored by:	EMC / Isilon Storage Division

17 files changed, 21 insertions, 30 deletions

diff --git a/contrib/ofed/usr.bin/ibaddr/Makefile b/contrib/ofed/usr.bin/ibaddr/Makefile
index b0af500..2270900 100644
--- a/contrib/ofed/usr.bin/ibaddr/Makefile
+++ b/contrib/ofed/usr.bin/ibaddr/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibaddr
 SRCS=   ibaddr.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibaddr.8
 
diff --git a/contrib/ofed/usr.bin/ibnetdiscover/Makefile b/contrib/ofed/usr.bin/ibnetdiscover/Makefile
index 1e6bc0e..f77c6ec 100644
--- a/contrib/ofed/usr.bin/ibnetdiscover/Makefile
+++ b/contrib/ofed/usr.bin/ibnetdiscover/Makefile
@@ -5,8 +5,8 @@
 
 PROG=   ibnetdiscover
 SRCS=   ibnetdiscover.c grouping.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibnetdiscover.8
 
 WARNS?= 1
diff --git a/contrib/ofed/usr.bin/ibping/Makefile b/contrib/ofed/usr.bin/ibping/Makefile
index f152855..55ceca8 100644
--- a/contrib/ofed/usr.bin/ibping/Makefile
+++ b/contrib/ofed/usr.bin/ibping/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibping
 SRCS=   ibping.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibping.8
 
diff --git a/contrib/ofed/usr.bin/ibportstate/Makefile b/contrib/ofed/usr.bin/ibportstate/Makefile
index e6af8bc..feaced2 100644
--- a/contrib/ofed/usr.bin/ibportstate/Makefile
+++ b/contrib/ofed/usr.bin/ibportstate/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibportstate
 SRCS=   ibportstate.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibportstate.8
 
diff --git a/contrib/ofed/usr.bin/ibroute/Makefile b/contrib/ofed/usr.bin/ibroute/Makefile
index bbbbda3..ab73621 100644
--- a/contrib/ofed/usr.bin/ibroute/Makefile
+++ b/contrib/ofed/usr.bin/ibroute/Makefile
@@ -5,8 +5,8 @@
 
 PROG=   ibroute
 SRCS=   ibroute.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibroute.8
 
 WARNS?= 1
diff --git a/contrib/ofed/usr.bin/ibsendtrap/Makefile b/contrib/ofed/usr.bin/ibsendtrap/Makefile
index 8548838..33ac49a 100644
--- a/contrib/ofed/usr.bin/ibsendtrap/Makefile
+++ b/contrib/ofed/usr.bin/ibsendtrap/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibsendtrap
 SRCS=   ibsendtrap.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=
 
diff --git a/contrib/ofed/usr.bin/ibstat/Makefile b/contrib/ofed/usr.bin/ibstat/Makefile
index 6c2c23c..652cc68 100644
--- a/contrib/ofed/usr.bin/ibstat/Makefile
+++ b/contrib/ofed/usr.bin/ibstat/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibstat
 SRCS=   ibstat.c
-LDADD=	-libumad -libcommon
+LIBADD= ibumad ibcommon
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibstat.8
 
diff --git a/contrib/ofed/usr.bin/ibsysstat/Makefile b/contrib/ofed/usr.bin/ibsysstat/Makefile
index 974e015..52fec8d 100644
--- a/contrib/ofed/usr.bin/ibsysstat/Makefile
+++ b/contrib/ofed/usr.bin/ibsysstat/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   ibsysstat
 SRCS=   ibsysstat.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibsysstat.8
 
diff --git a/contrib/ofed/usr.bin/ibtracert/Makefile b/contrib/ofed/usr.bin/ibtracert/Makefile
index cbfae3e..9c4a494 100644
--- a/contrib/ofed/usr.bin/ibtracert/Makefile
+++ b/contrib/ofed/usr.bin/ibtracert/Makefile
@@ -5,8 +5,8 @@
 
 PROG=   ibtracert
 SRCS=   ibtracert.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	ibtracert.8
 
 WARNS?= 1
diff --git a/contrib/ofed/usr.bin/opensm/Makefile b/contrib/ofed/usr.bin/opensm/Makefile
index ae45eaa..4dd1b06 100644
--- a/contrib/ofed/usr.bin/opensm/Makefile
+++ b/contrib/ofed/usr.bin/opensm/Makefile
@@ -29,8 +29,7 @@ SRCS+=	osm_vl_arb_rcv.c st.c osm_perfmgr.c osm_perfmgr_db.c osm_event_plugin.c
 SRCS+=	osm_dump.c osm_ucast_cache.c osm_qos_parser_y.y osm_qos_parser_l.l
 SRCS+=	osm_qos_policy.c
 
-LDADD=	-lopensm -losmvendor -losmcomp -libmad -libumad -libcommon
-CFLAGS+= -pthread
+LIBADD= opensm osmvendor osmcomp ibmad ibumad ibcommon pthread
 CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
 
 MAN=	opensm.8
diff --git a/contrib/ofed/usr.bin/osmtest/Makefile b/contrib/ofed/usr.bin/osmtest/Makefile
index 038d1db1..0330b2e 100644
--- a/contrib/ofed/usr.bin/osmtest/Makefile
+++ b/contrib/ofed/usr.bin/osmtest/Makefile
@@ -16,14 +16,7 @@ SRCS=	main.c \
 	osmt_slvl_vl_arb.c \
 	osmtest.c
 
-LDADD=	-libcommon \
-	-libmad \
-	-libumad \
-	-losmvendor \
-	-losmcomp \
-	-lopensm \
-
-LIBADD+= pthread
+LIBADD= ibcommon ibmad ibumad osmvendor osmcomp opensm pthread
 
 CFLAGS=	-DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \
 	-I${OPENSM}/osmtest/include
diff --git a/contrib/ofed/usr.bin/perfquery/Makefile b/contrib/ofed/usr.bin/perfquery/Makefile
index 792d575..ba337e1 100644
--- a/contrib/ofed/usr.bin/perfquery/Makefile
+++ b/contrib/ofed/usr.bin/perfquery/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   perfquery
 SRCS=   perfquery.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	perfquery.8
 
diff --git a/contrib/ofed/usr.bin/saquery/Makefile b/contrib/ofed/usr.bin/saquery/Makefile
index efb6036..210224a 100644
--- a/contrib/ofed/usr.bin/saquery/Makefile
+++ b/contrib/ofed/usr.bin/saquery/Makefile
@@ -5,10 +5,9 @@
 
 PROG=   saquery
 SRCS=   saquery.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp -losmvendor -lopensm
+LIBADD= ibumad ibcommon ibmad osmcomp osmvendor opensm pthread
 CFLAGS+= -I${DIAGPATH}/include
 CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
-CFLAGS+= -pthread
 MAN=	saquery.8
 
 WARNS?= 1
diff --git a/contrib/ofed/usr.bin/sminfo/Makefile b/contrib/ofed/usr.bin/sminfo/Makefile
index 90f9887..0ec6656 100644
--- a/contrib/ofed/usr.bin/sminfo/Makefile
+++ b/contrib/ofed/usr.bin/sminfo/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   sminfo
 SRCS=   sminfo.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	sminfo.8
 
diff --git a/contrib/ofed/usr.bin/smpdump/Makefile b/contrib/ofed/usr.bin/smpdump/Makefile
index 4db68be..e9258a5 100644
--- a/contrib/ofed/usr.bin/smpdump/Makefile
+++ b/contrib/ofed/usr.bin/smpdump/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   smpdump
 SRCS=   smpdump.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	smpdump.8
 
diff --git a/contrib/ofed/usr.bin/smpquery/Makefile b/contrib/ofed/usr.bin/smpquery/Makefile
index edfedd1..f08df7d 100644
--- a/contrib/ofed/usr.bin/smpquery/Makefile
+++ b/contrib/ofed/usr.bin/smpquery/Makefile
@@ -5,8 +5,8 @@
 
 PROG=   smpquery
 SRCS=   smpquery.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad -losmcomp
-CFLAGS+= -pthread -I${DIAGPATH}/include
+LIBADD= ibumad ibcommon ibmad osmcomp pthread
+CFLAGS+= -I${DIAGPATH}/include
 MAN=	smpquery.8
 
 WARNS?= 1
diff --git a/contrib/ofed/usr.bin/vendstat/Makefile b/contrib/ofed/usr.bin/vendstat/Makefile
index bfca2c8..df18313 100644
--- a/contrib/ofed/usr.bin/vendstat/Makefile
+++ b/contrib/ofed/usr.bin/vendstat/Makefile
@@ -5,7 +5,7 @@
 
 PROG=   vendstat
 SRCS=   vendstat.c ibdiag_common.c
-LDADD=	-libumad -libcommon -libmad
+LIBADD= ibumad ibcommon ibmad
 CFLAGS+= -I${DIAGPATH}/include
 MAN=	vendstat.8