Update cxgb include paths to not require prefixing with dev/cxgb

Submitted by:	Chelsio Inc.

5 files changed, 14 insertions, 9 deletions

diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile
index a8dff58..4868a0ed 100644
--- a/sys/modules/cxgb/cxgb/Makefile
+++ b/sys/modules/cxgb/cxgb/Makefile
@@ -10,7 +10,7 @@ SRCS+=  cxgb_sge.c cxgb_offload.c cxgb_tn1010.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h
 SRCS+=	uipc_mvec.c cxgb_support.c cxgb_multiq.c 
 
-CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP
+CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB}
 CFLAGS+= -DDISABLE_MBUF_IOVEC
 #CFLAGS+= -DIFNET_MULTIQUEUE
 #CFLAGS+= -DDISABLE_MBUF_IOVEC
diff --git a/sys/modules/cxgb/cxgb_t3fw/Makefile b/sys/modules/cxgb/cxgb_t3fw/Makefile
index 0a097aa..0d2f363 100644
--- a/sys/modules/cxgb/cxgb_t3fw/Makefile
+++ b/sys/modules/cxgb/cxgb_t3fw/Makefile
@@ -5,5 +5,6 @@ CXGB = ${.CURDIR}/../../../dev/cxgb
 
 KMOD= cxgb_t3fw
 SRCS+= cxgb_t3fw.c
+CFLAGS+= -g -I${CXGB}
 
-.include <bsd.kmod.mk>
\ No newline at end of file
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile
index e1123bb..1731285 100644
--- a/sys/modules/cxgb/iw_cxgb/Makefile
+++ b/sys/modules/cxgb/iw_cxgb/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 CXGB = ${.CURDIR}/../../../dev/cxgb
-.PATH: ${IW_CXGB} ${CXGB}/common ${CXGB}/ulp/iw_cxgb
+.PATH: ${CXGB}/ulp/iw_cxgb
 
 KMOD=   iw_cxgb
 SRCS=   iw_cxgb.c iw_cxgb_cm.c iw_cxgb_hal.c 
 SRCS+=  iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c
 SRCS+=  iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c
 SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
-CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED  -I${CXGB} -DSMP
+CFLAGS+= -g -I${CXGB}
 #CFLAGS+= -DDEBUG
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/toecore/Makefile b/sys/modules/cxgb/toecore/Makefile
index 1c05d79..52b9f62 100644
--- a/sys/modules/cxgb/toecore/Makefile
+++ b/sys/modules/cxgb/toecore/Makefile
@@ -1,8 +1,11 @@
 # $FreeBSD$
-TOECORE = ${.CURDIR}/../../../dev/cxgb/ulp/toecore
-.PATH: ${TOECORE} 
+
+CXGB = ${.CURDIR}/../../../dev/cxgb
+.PATH: ${CXGB}/ulp/toecore
 
 KMOD=	toecore
 SRCS=   toedev.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_sched.h
-.include <bsd.kmod.mk>
\ No newline at end of file
+CFLAGS+= -g -I${CXGB}
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile
index 2417edf..2b8750a 100644
--- a/sys/modules/cxgb/tom/Makefile
+++ b/sys/modules/cxgb/tom/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-TOM = ${.CURDIR}/../../../dev/cxgb/ulp/tom
-.PATH: ${TOM} 
+CXGB = ${.CURDIR}/../../../dev/cxgb
+.PATH: ${CXGB}/ulp/tom
 
 KMOD=	tom
 SRCS=   cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_tom_sysctl.c cxgb_cpl_socket.c
@@ -9,6 +9,7 @@ SRCS+=  cxgb_ddp.c cxgb_vm.c cxgb_l2t.c cxgb_tcp_offload.c
 SRCS+=	opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h opt_mac.h 
 SRCS+=	opt_tcpdebug.h opt_ddb.h opt_sched.h opt_global.h opt_ktr.h
 SRCS+=	device_if.h bus_if.h pci_if.h
+CFLAGS+= -g -I${CXGB}
 
 #CFLAGS+= -DDEBUG_PRINT -DDEBUG
 .include <bsd.kmod.mk>