Remove no longer needed TESTBUILD defines from OFED Makefiles.

Sponsored by:	Mellanox Technologies

18 files changed, 0 insertions, 76 deletions

diff --git a/contrib/ofed/Makefile b/contrib/ofed/Makefile
index 20c336c1cdc7..3e987ab499b7 100644
--- a/contrib/ofed/Makefile
+++ b/contrib/ofed/Makefile
@@ -44,12 +44,4 @@ SUBDIR+= ${SUBDIR_${L}}
 
 SUBDIR_PARALLEL=
 
-.if defined(TESTBUILD)
-all-install:
-.for D in ${SUBDIR}
-	cd ${.CURDIR}/${D} ; ${MAKE} clean cleandepend
-	cd ${.CURDIR}/${D} ; ${MAKE} depend all install
-.endfor
-.else
 .include <bsd.subdir.mk>
-.endif
diff --git a/contrib/ofed/infiniband-diags/build/Makefile.inc b/contrib/ofed/infiniband-diags/build/Makefile.inc
index da56d0fcb4ba..60b4c7000e75 100644
--- a/contrib/ofed/infiniband-diags/build/Makefile.inc
+++ b/contrib/ofed/infiniband-diags/build/Makefile.inc
@@ -8,9 +8,5 @@ CFLAGS+= -I${INCLUDEDIR}/infiniband
 CFLAGS+= -DHAVE_CONFIG_H=1
 CFLAGS+= -I${.CURDIR}/../../
 CFLAGS+= -I${.CURDIR}/../../src
-.if defined(TESTBUILD)
-LDFLAGS+= -losmcomp -libmad -libumad
-.else
 LIBADD+= osmcomp ibmad ibumad
-.endif
 
diff --git a/contrib/ofed/infiniband-diags/build/dump_fts/Makefile b/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
index aac67beab18b..93f09e5153d2 100644
--- a/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
+++ b/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
@@ -2,11 +2,7 @@
 
 PROG=	dump_fts
 SRCS=	dump_fts.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD= ibnetdisc
-.endif
 MAN=	dump_fts.8
 
 .include <bsd.prog.mk>
diff --git a/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile b/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
index f686a151da31..67225afd79cd 100644
--- a/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
+++ b/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
@@ -2,11 +2,7 @@
 
 PROG=	ibcacheedit
 SRCS=	ibcacheedit.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD=	ibnetdisc
-.endif
 MAN=	ibcacheedit.8
 
 .include <bsd.prog.mk>
diff --git a/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile b/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
index cc0e5f086142..49a0482bb0c3 100644
--- a/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
+++ b/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
@@ -2,11 +2,7 @@
 
 PROG=	iblinkinfo
 SRCS=	iblinkinfo.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD= ibnetdisc
-.endif
 MAN=	iblinkinfo.8
 
 .include <bsd.prog.mk>
diff --git a/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile b/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
index 847e4f7a8ca5..34090be9fae8 100644
--- a/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
+++ b/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
@@ -2,11 +2,7 @@
 
 PROG=	ibnetdiscover
 SRCS=	ibnetdiscover.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD=	ibnetdisc
-.endif
 MAN=	ibnetdiscover.8
 
 .include <bsd.prog.mk>
diff --git a/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile b/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
index 5aa97cc4de2c..c4be267f4362 100644
--- a/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
+++ b/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
@@ -2,11 +2,7 @@
 
 PROG=	ibqueryerrors
 SRCS=	ibqueryerrors.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD=	ibnetdisc
-.endif
 MAN=	ibqueryerrors.8
 
 .include <bsd.prog.mk>
diff --git a/contrib/ofed/libcxgb4/Makefile b/contrib/ofed/libcxgb4/Makefile
index d6c7b2feae24..98196ea3a4ba 100644
--- a/contrib/ofed/libcxgb4/Makefile
+++ b/contrib/ofed/libcxgb4/Makefile
@@ -13,11 +13,7 @@ dev.c \
 qp.c \
 verbs.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs -lpthread
-.else
 LIBADD=		ibverbs pthread
-.endif
 CFLAGS+=	-I${.CURDIR}
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/libibcm/Makefile b/contrib/ofed/libibcm/Makefile
index 597dfe2453f3..df21677e2b73 100644
--- a/contrib/ofed/libibcm/Makefile
+++ b/contrib/ofed/libibcm/Makefile
@@ -7,11 +7,7 @@ LIB=		ibcm
 SHLIB_MAJOR=	1
 MK_PROFILE=	no
 SRCS=		cm.c
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs
-.else
 LDADD=		ibverbs
-.endif
 CFLAGS+=	-I${.CURDIR}
 MAN=
 VERSION_MAP=	${.CURDIR}/libibcm.map
diff --git a/contrib/ofed/libibmad/Makefile b/contrib/ofed/libibmad/Makefile
index 8860971ae4eb..ceef5ebc207b 100644
--- a/contrib/ofed/libibmad/Makefile
+++ b/contrib/ofed/libibmad/Makefile
@@ -23,11 +23,7 @@ serv.c \
 smp.c \
 vendor.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libumad
-.else
 LIBADD=		ibumad
-.endif
 CFLAGS+=	-DHAVE_CONFIG_H=1
 CFLAGS+=	-I${.CURDIR}
 VERSION_MAP=	${.CURDIR}/libibmad.map
diff --git a/contrib/ofed/libibnetdisc/Makefile b/contrib/ofed/libibnetdisc/Makefile
index ef44e14080f3..9f674ea4d062 100644
--- a/contrib/ofed/libibnetdisc/Makefile
+++ b/contrib/ofed/libibnetdisc/Makefile
@@ -24,11 +24,7 @@ ibnd_iter_nodes.3 \
 ibnd_iter_nodes_type.3 \
 ibnd_show_progress.3
 
-.if defined(TESTBUILD)
-LDFLAGS=	-losmcomp -libmad -libumad
-.else
 LIBADD=		osmcomp ibmad ibumad
-.endif
 CFLAGS+=	-DHAVE_CONFIG_H=1
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
diff --git a/contrib/ofed/libmlx4/Makefile b/contrib/ofed/libmlx4/Makefile
index 831d6d015e21..4867cc67fa77 100644
--- a/contrib/ofed/libmlx4/Makefile
+++ b/contrib/ofed/libmlx4/Makefile
@@ -16,11 +16,7 @@ qp.c \
 srq.c \
 verbs.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs -lpthread
-.else
 LDADD=		ibverbs pthread
-.endif
 CFLAGS+=	-I${.CURDIR}
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/libmlx5/Makefile b/contrib/ofed/libmlx5/Makefile
index eabca8984975..180b67ac6813 100644
--- a/contrib/ofed/libmlx5/Makefile
+++ b/contrib/ofed/libmlx5/Makefile
@@ -16,11 +16,7 @@ qp.c \
 srq.c \
 verbs.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs -lpthread
-.else
 LDADD=		ibverbs pthread
-.endif
 CFLAGS+=	-I${.CURDIR}
 VERSION_MAP=	${.CURDIR}/libmlx5.map
 
diff --git a/contrib/ofed/librdmacm/Makefile b/contrib/ofed/librdmacm/Makefile
index eb53a9461f84..6bc272431636 100644
--- a/contrib/ofed/librdmacm/Makefile
+++ b/contrib/ofed/librdmacm/Makefile
@@ -65,11 +65,7 @@ rdma_resolve_addr.3 \
 rdma_resolve_route.3 \
 rdma_set_option.3
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs
-.else
 LDADD=		ibverbs
-.endif
 VERSION_MAP=	${.CURDIR}/librdmacm.map
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/opensm/complib/Makefile b/contrib/ofed/opensm/complib/Makefile
index 3eec2f6161ce..77398268652d 100644
--- a/contrib/ofed/opensm/complib/Makefile
+++ b/contrib/ofed/opensm/complib/Makefile
@@ -28,11 +28,7 @@ ib_statustext.c
 
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
-.if defined(TESTBUILD)
-LDFLAGS=	-lpthread
-.else
 LDADD=		pthread
-.endif
 VERSION_MAP=	${.CURDIR}/libosmcomp.map
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/opensm/libopensm/Makefile b/contrib/ofed/opensm/libopensm/Makefile
index 6b2e511d0bca..5ffcd995eb87 100644
--- a/contrib/ofed/opensm/libopensm/Makefile
+++ b/contrib/ofed/opensm/libopensm/Makefile
@@ -12,11 +12,7 @@ osm_log.c \
 osm_mad_pool.c \
 osm_helper.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-lpthread
-.else
 LIBADD=		pthread
-.endif
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/../opensm/libopensm.map
diff --git a/contrib/ofed/opensm/libvendor/Makefile b/contrib/ofed/opensm/libvendor/Makefile
index a4d078156452..3728ba979743 100644
--- a/contrib/ofed/opensm/libvendor/Makefile
+++ b/contrib/ofed/opensm/libvendor/Makefile
@@ -11,11 +11,7 @@ SRCS= \
 osm_vendor_ibumad.c \
 osm_vendor_ibumad_sa.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libumad -lpthread
-.else
 LIBADD=		ibumad pthread
-.endif
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/libosmvendor.map
diff --git a/contrib/ofed/opensm/opensm/Makefile b/contrib/ofed/opensm/opensm/Makefile
index f4a1d99ed6ce..de0c3ba3c40f 100644
--- a/contrib/ofed/opensm/opensm/Makefile
+++ b/contrib/ofed/opensm/opensm/Makefile
@@ -96,10 +96,6 @@ st.c
 MAN=		opensm.8
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
-.if defined(TESTBUILD)
-LDFLAGS=	-lopensm -losmvendor -losmcomp -lwrap -lpthread
-.else
 LDADD=		opensm osmvendor osmcomp wrap pthread
-.endif
 
 .include <bsd.prog.mk>