diff options
11 files changed, 20 insertions, 11 deletions
diff --git a/contrib/ofed/librdmacm/examples/build/cmatose/Makefile b/contrib/ofed/librdmacm/examples/build/cmatose/Makefile index c4515ac..31d2ae7 100644 --- a/contrib/ofed/librdmacm/examples/build/cmatose/Makefile +++ b/contrib/ofed/librdmacm/examples/build/cmatose/Makefile @@ -6,5 +6,6 @@ PROG= cmatose MAN= SRCS= cmatose.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include <bsd.prog.mk> diff --git a/contrib/ofed/librdmacm/examples/build/mckey/Makefile b/contrib/ofed/librdmacm/examples/build/mckey/Makefile index d4ad295..4abaf27 100644 --- a/contrib/ofed/librdmacm/examples/build/mckey/Makefile +++ b/contrib/ofed/librdmacm/examples/build/mckey/Makefile @@ -6,5 +6,6 @@ PROG= mckey MAN= SRCS= mckey.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include <bsd.prog.mk> diff --git a/contrib/ofed/librdmacm/examples/build/rping/Makefile b/contrib/ofed/librdmacm/examples/build/rping/Makefile index 05ef562..b167a54 100644 --- a/contrib/ofed/librdmacm/examples/build/rping/Makefile +++ b/contrib/ofed/librdmacm/examples/build/rping/Makefile @@ -6,5 +6,6 @@ PROG= rping MAN= SRCS= rping.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include <bsd.prog.mk> diff --git a/contrib/ofed/librdmacm/examples/build/udaddy/Makefile b/contrib/ofed/librdmacm/examples/build/udaddy/Makefile index 16d9419..1e32550 100644 --- a/contrib/ofed/librdmacm/examples/build/udaddy/Makefile +++ b/contrib/ofed/librdmacm/examples/build/udaddy/Makefile @@ -6,5 +6,6 @@ PROG= udaddy MAN= SRCS= udaddy.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include <bsd.prog.mk> diff --git a/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c b/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c index 2cfaa8a..5e092f7 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c +++ b/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c @@ -50,7 +50,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibnetdiscover.h" #include "grouping.h" diff --git a/contrib/ofed/management/infiniband-diags/src/ibroute.c b/contrib/ofed/management/infiniband-diags/src/ibroute.c index f2ee170..9607aa9 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibroute.c +++ b/contrib/ofed/management/infiniband-diags/src/ibroute.c @@ -49,7 +49,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c b/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c index 66620de..2754dc0 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c +++ b/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c @@ -43,7 +43,7 @@ #include <getopt.h> #include <infiniband/mad.h> -#include <infiniband/iba/ib_types.h> +#include <iba/ib_types.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/management/infiniband-diags/src/ibtracert.c b/contrib/ofed/management/infiniband-diags/src/ibtracert.c index bde0ea7..f8ecf76 100644 --- a/contrib/ofed/management/infiniband-diags/src/ibtracert.c +++ b/contrib/ofed/management/infiniband-diags/src/ibtracert.c @@ -49,7 +49,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/management/infiniband-diags/src/saquery.c b/contrib/ofed/management/infiniband-diags/src/saquery.c index 97663d1..9f882e7 100644 --- a/contrib/ofed/management/infiniband-diags/src/saquery.c +++ b/contrib/ofed/management/infiniband-diags/src/saquery.c @@ -50,12 +50,12 @@ #include <getopt.h> #include <infiniband/mad.h> -#include <infiniband/opensm/osm_log.h> -#include <infiniband/vendor/osm_vendor_api.h> -#include <infiniband/vendor/osm_vendor_sa_api.h> -#include <infiniband/opensm/osm_mad_pool.h> -#include <infiniband/complib/cl_debug.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <opensm/osm_log.h> +#include <vendor/osm_vendor_api.h> +#include <vendor/osm_vendor_sa_api.h> +#include <opensm/osm_mad_pool.h> +#include <complib/cl_debug.h> +#include <complib/cl_nodenamemap.h> #include <netinet/in.h> diff --git a/contrib/ofed/management/infiniband-diags/src/smpquery.c b/contrib/ofed/management/infiniband-diags/src/smpquery.c index ed8ec83..01ccfaf 100644 --- a/contrib/ofed/management/infiniband-diags/src/smpquery.c +++ b/contrib/ofed/management/infiniband-diags/src/smpquery.c @@ -50,7 +50,7 @@ #include <infiniband/common.h> #include <infiniband/umad.h> #include <infiniband/mad.h> -#include <infiniband/complib/cl_nodenamemap.h> +#include <complib/cl_nodenamemap.h> #include "ibdiag_common.h" diff --git a/contrib/ofed/usr.bin/Makefile.inc b/contrib/ofed/usr.bin/Makefile.inc index e6a0550..d05778c 100644 --- a/contrib/ofed/usr.bin/Makefile.inc +++ b/contrib/ofed/usr.bin/Makefile.inc @@ -1,4 +1,9 @@ DIAGPATH= ${.CURDIR}/../../management/infiniband-diags BINDIR?= /usr/bin CFLAGS+= -I${.CURDIR}/../../include/infiniband +CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -I${.CURDIR}/../../management/opensm/include/ +CFLAGS+= -I${.CURDIR}/../../management/opensm +CFLAGS+= -I${.CURDIR}/../../management/libibcommon/include +CFLAGS+= -I${.CURDIR}/../../management/libibumad/include +CFLAGS+= -I${.CURDIR}/../../management/libibmad/include |
