svn commit: r219022 - in projects/ofed/head/contrib/ofed: usr.bin
usr.bin/ibnetdiscover usr.bin/ibroute usr.bin/ibsendtrap
usr.bin/ibstat usr.bin/ibtracert usr.bin/opensm
usr.bin/saquery usr.bin/sm...
Jeff Roberson
jeff at FreeBSD.org
Fri Feb 25 03:06:32 UTC 2011
Author: jeff
Date: Fri Feb 25 03:06:31 2011
New Revision: 219022
URL: http://svn.freebsd.org/changeset/base/219022
Log:
- Update Makefiles to correctly reference include files from /usr/obj
rather than the host system when built as part of buildworld.
Added:
projects/ofed/head/contrib/ofed/usr.lib/Makefile.inc
Modified:
projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc
projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile
projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile
projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile
projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile
projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile
projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile
projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile
projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile
projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile
projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile
Modified: projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/Makefile.inc Fri Feb 25 03:06:31 2011 (r219022)
@@ -1,2 +1,4 @@
DIAGPATH= ${.CURDIR}/../../management/infiniband-diags
BINDIR?= /usr/bin
+CFLAGS+= -I${.CURDIR}/../../include/infiniband
+CFLAGS+= -I${.CURDIR}/../../management/opensm/include/
Modified: projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/ibnetdiscover/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,8 +6,7 @@
PROG= ibnetdiscover
SRCS= ibnetdiscover.c grouping.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad -losmcomp
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
-CFLAGS+= -pthread
+CFLAGS+= -pthread -I${DIAGPATH}/include
MAN= ibnetdiscover.8
WARNS?= 1
Modified: projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/ibroute/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,8 +6,7 @@
PROG= ibroute
SRCS= ibroute.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad -losmcomp
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
-CFLAGS+= -pthread
+CFLAGS+= -pthread -I${DIAGPATH}/include
MAN= ibroute.8
WARNS?= 1
Modified: projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/ibsendtrap/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,7 +6,7 @@
PROG= ibsendtrap
SRCS= ibsendtrap.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
+CFLAGS+= -I${DIAGPATH}/include
NO_MAN= true
WARNS?= 1
Modified: projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/ibstat/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,7 +6,7 @@
PROG= ibstat
SRCS= ibstat.c
LDADD= -libumad -libcommon
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
+CFLAGS+= -I${DIAGPATH}/include
MAN= ibstat.8
WARNS?= 1
Modified: projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/ibtracert/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,8 +6,7 @@
PROG= ibtracert
SRCS= ibtracert.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad -losmcomp
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
-CFLAGS+= -pthread
+CFLAGS+= -pthread -I${DIAGPATH}/include
MAN= ibtracert.8
WARNS?= 1
Modified: projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -30,7 +30,6 @@ SRCS+= osm_dump.c osm_ucast_cache.c osm_
SRCS+= osm_qos_policy.c
LDADD= -lopensm -losmvendor -losmcomp -libmad -libumad -libcommon
-CFLAGS+= -I/usr/include/infiniband
CFLAGS+= -pthread
CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
Modified: projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/saquery/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,7 +6,7 @@
PROG= saquery
SRCS= saquery.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad -losmcomp -losmvendor -lopensm
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
+CFLAGS+= -I${DIAGPATH}/include
CFLAGS+= -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP
CFLAGS+= -pthread
MAN= saquery.8
Modified: projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/smpdump/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,7 +6,7 @@
PROG= smpdump
SRCS= smpdump.c
LDADD= -libumad -libcommon -libmad
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband
+CFLAGS+= -I${DIAGPATH}/include
MAN= smpdump.8
WARNS?= 1
Modified: projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.bin/smpquery/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -6,8 +6,7 @@
PROG= smpquery
SRCS= smpquery.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad -losmcomp
-CFLAGS+= -I${DIAGPATH}/include -I/usr/include/infiniband/
-CFLAGS+= -pthread
+CFLAGS+= -pthread -I${DIAGPATH}/include
MAN= smpquery.8
WARNS?= 1
Added: projects/ofed/head/contrib/ofed/usr.lib/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ofed/head/contrib/ofed/usr.lib/Makefile.inc Fri Feb 25 03:06:31 2011 (r219022)
@@ -0,0 +1,17 @@
+IBMGMT= ${.CURDIR}/../../management
+IBCOMMONDIR= ${IBMGMT}/libibcommon
+IBMADDIR= ${IBMGMT}/libibmad
+UMADDIR= ${IBMGMT}/libibumad
+OPENSMDIR= ${IBMGMT}/opensm
+COMPLIBDIR= ${OPENSMDIR}/complib
+VENDORLIBDIR= ${OPENSMDIR}/libvendor
+IBVERBSDIR= ${.CURDIR}/../../libibverbs
+IBINC= ${.CURDIR}/../../include
+
+CFLAGS+= -I${.CURDIR} -I${IBINC}/infiniband
+CFLAGS+= -I${IBCOMMONDIR}/include/infiniband
+CFLAGS+= -I${IBMADDIR}/include/infiniband
+CFLAGS+= -I${UMADDIR}/include/infiniband
+CFLAGS+= -I${OPENSMDIR}/include
+# CFLAGS+= -I${UMADDIR}/include
+# CFLAGS+= -I${IBVERBSDIR}/include
Modified: projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libibcm/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,6 +3,7 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
+.include "../Makefile.inc"
IBCMDIR= ${.CURDIR}/../../libibcm
IBSRCDIR= ${IBCMDIR}/src
@@ -14,6 +15,7 @@ SHLIB_MAJOR= 1
NO_PROFILE=
SRCS= cm.c
+CFLAGS+= -I ${IBCMDIR}/include
MAN=
VERSION_MAP= ${IBSRCDIR}/libibcm.map
Modified: projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,8 +3,8 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
+.include "../Makefile.inc"
-IBCOMMONDIR= ${.CURDIR}/../../management/libibcommon
IBSRCDIR= ${IBCOMMONDIR}/src
.PATH: ${IBSRCDIR}
@@ -15,8 +15,6 @@ NO_PROFILE=
SRCS= sysfs.c util.c hash.c stack.c time.c
-CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I/usr/include/infiniband
-
VERSION_MAP= ${IBSRCDIR}/libibcommon.map
.include <bsd.lib.mk>
Modified: projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,9 +3,8 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
+.include "../Makefile.inc"
-IBMADDIR= ${.CURDIR}/../../management/libibmad
-UMADDIR= ${.CURDIR}/../../management/libibumad/include
IBSRCDIR= ${IBMADDIR}/src
.PATH: ${IBSRCDIR}
@@ -18,8 +17,6 @@ SRCS= dump.c fields.c gs.c mad.c portid.
serv.c smp.c vendor.c
CFLAGS+= -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBMADDIR}/include
-CFLAGS+= -I/usr/include/infiniband
VERSION_MAP= ${IBSRCDIR}/libibmad.map
Modified: projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,8 +3,8 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
+.include "../Makefile.inc"
-UMADDIR= ${.CURDIR}/../../management/libibumad
IBSRCDIR= ${UMADDIR}/src
.PATH: ${IBSRCDIR}
@@ -16,7 +16,6 @@ NO_PROFILE=
SRCS= umad.c
CFLAGS+= -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband
VERSION_MAP= ${IBSRCDIR}/libibumad.map
Modified: projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libibverbs/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,8 +3,8 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
+.include "../Makefile.inc"
-IBVERBSDIR= ${.CURDIR}/../../libibverbs
IBSRCDIR= ${IBVERBSDIR}/src
IBMANDIR= ${IBVERBSDIR}/man
@@ -33,7 +33,6 @@ MAN= ibv_alloc_pd.3 ibv_asyncwatch.1 ibv
CFLAGS+= -DHAVE_CONFIG_H -DIBV_CONFIG_DIR=\"/etc/ibverbs/\"
-CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBVERBSDIR}/include
VERSION_MAP= ${IBSRCDIR}/libibverbs.map
Modified: projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libopensm/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,10 +3,9 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
+.include "../Makefile.inc"
-OPENSMDIR= ${.CURDIR}/../../management/opensm/opensm
-
-.PATH: ${OPENSMDIR}
+.PATH: ${OPENSMDIR}/opensm
LIB= opensm
SHLIB_MAJOR= 1
@@ -14,8 +13,6 @@ NO_PROFILE=
SRCS= osm_log.c osm_mad_pool.c osm_helper.c
-CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband
-
-VERSION_MAP= ${OPENSMDIR}/libopensm.map
+VERSION_MAP= ${OPENSMDIR}/opensm/libopensm.map
.include <bsd.lib.mk>
Modified: projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libosmcomp/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,8 +3,7 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
-
-COMPLIBDIR= ${.CURDIR}/../../management/opensm/complib
+.include "../Makefile.inc"
.PATH: ${COMPLIBDIR}
@@ -17,8 +16,6 @@ SRCS+= cl_log.c cl_map.c cl_pool.c cl_pt
SRCS+= cl_statustext.c cl_thread.c cl_threadpool.c cl_timer.c cl_vector.c
SRCS+= ib_statustext.c cl_nodenamemap.c
-CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband
-
VERSION_MAP= ${COMPLIBDIR}/libosmcomp.map
.include <bsd.lib.mk>
Modified: projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile
==============================================================================
--- projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile Fri Feb 25 00:11:34 2011 (r219021)
+++ projects/ofed/head/contrib/ofed/usr.lib/libosmvendor/Makefile Fri Feb 25 03:06:31 2011 (r219022)
@@ -3,8 +3,7 @@
SHLIBDIR?= /usr/lib
.include <bsd.own.mk>
-
-VENDORLIBDIR= ${.CURDIR}/../../management/opensm/libvendor
+.include "../Makefile.inc"
.PATH: ${VENDORLIBDIR}
@@ -14,7 +13,6 @@ NO_PROFILE=
SRCS= osm_vendor_ibumad.c osm_vendor_ibumad_sa.c
-CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband
CFLAGS+= -DOSM_VENDOR_INTF_OPENIB
VERSION_MAP= ${VENDORLIBDIR}/libosmvendor.map
More information about the svn-src-projects
mailing list