Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Aug 2014 01:30:16 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r269364 - in head/sys/modules/cxgbe: . if_cxgbe iw_cxgbe t4_firmware t5_firmware tom
Message-ID:  <201408010130.s711UGEC055984@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: np
Date: Fri Aug  1 01:30:16 2014
New Revision: 269364
URL: http://svnweb.freebsd.org/changeset/base/269364

Log:
  Improve compliance with style.Makefile(5).
  
  MFC after:	2 weeks

Modified:
  head/sys/modules/cxgbe/Makefile
  head/sys/modules/cxgbe/if_cxgbe/Makefile
  head/sys/modules/cxgbe/iw_cxgbe/Makefile
  head/sys/modules/cxgbe/t4_firmware/Makefile
  head/sys/modules/cxgbe/t5_firmware/Makefile
  head/sys/modules/cxgbe/tom/Makefile

Modified: head/sys/modules/cxgbe/Makefile
==============================================================================
--- head/sys/modules/cxgbe/Makefile	Fri Aug  1 00:00:54 2014	(r269363)
+++ head/sys/modules/cxgbe/Makefile	Fri Aug  1 01:30:16 2014	(r269364)
@@ -4,21 +4,21 @@
 
 .include <src.opts.mk>
 
-SUBDIR = if_cxgbe
-SUBDIR+= t4_firmware
-SUBDIR+= t5_firmware
-SUBDIR+= ${_tom}
-SUBDIR+= ${_iw_cxgbe}
+SUBDIR=	if_cxgbe
+SUBDIR+=	t4_firmware
+SUBDIR+=	t5_firmware
+SUBDIR+=	${_tom}
+SUBDIR+=	${_iw_cxgbe}
 
 .if ${MACHINE_CPUARCH} == "amd64"
-_tom=		tom
+_tom=	tom
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _iw_cxgbe=	iw_cxgbe
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
-_tom=		tom
+_tom=	tom
 .endif
 
 .include <bsd.subdir.mk>

Modified: head/sys/modules/cxgbe/if_cxgbe/Makefile
==============================================================================
--- head/sys/modules/cxgbe/if_cxgbe/Makefile	Fri Aug  1 00:00:54 2014	(r269363)
+++ head/sys/modules/cxgbe/if_cxgbe/Makefile	Fri Aug  1 01:30:16 2014	(r269364)
@@ -4,21 +4,22 @@
 
 .include <src.opts.mk>
 
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE} ${CXGBE}/common
 
-KMOD = if_cxgbe
-SRCS = t4_main.c t4_sge.c t4_l2t.c t4_tracer.c t4_netmap.c
-SRCS+= t4_hw.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h opt_inet6.h
-SRCS+= opt_ofed.h
-
-CFLAGS+= -I${CXGBE}
+KMOD=	if_cxgbe
+SRCS=	t4_main.c t4_sge.c t4_l2t.c t4_tracer.c t4_netmap.c
+SRCS+=	t4_hw.c
+SRCS+=	device_if.h bus_if.h pci_if.h
+SRCS+=	opt_inet.h opt_inet6.h
+SRCS+=	opt_ofed.h
 
 # Provide the timestamp of a packet in its header mbuf.
 #CFLAGS+= -DT4_PKT_TIMESTAMP
 
+CFLAGS+= -I${CXGBE}
+
+
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
 opt_inet.h:

Modified: head/sys/modules/cxgbe/iw_cxgbe/Makefile
==============================================================================
--- head/sys/modules/cxgbe/iw_cxgbe/Makefile	Fri Aug  1 00:00:54 2014	(r269363)
+++ head/sys/modules/cxgbe/iw_cxgbe/Makefile	Fri Aug  1 01:30:16 2014	(r269364)
@@ -2,13 +2,13 @@
 
 .include <src.opts.mk>
 
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE}/iw_cxgbe
 
-KMOD=   iw_cxgbe
-SRCS=   device.c cm.c provider.c mem.c cq.c qp.c resource.c ev.c id_table.c
-SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
-SRCS+=  opt_inet.h opt_ofed.h vnode_if.h
+KMOD=	iw_cxgbe
+SRCS=	device.c cm.c provider.c mem.c cq.c qp.c resource.c ev.c id_table.c
+SRCS+=	bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
+SRCS+=	opt_inet.h opt_ofed.h vnode_if.h
 CFLAGS+= -I${CXGBE} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED
 
 .if !defined(KERNBUILDDIR)

Modified: head/sys/modules/cxgbe/t4_firmware/Makefile
==============================================================================
--- head/sys/modules/cxgbe/t4_firmware/Makefile	Fri Aug  1 00:00:54 2014	(r269363)
+++ head/sys/modules/cxgbe/t4_firmware/Makefile	Fri Aug  1 01:30:16 2014	(r269364)
@@ -2,24 +2,24 @@
 # $FreeBSD$
 #
 
-T4FW = ${.CURDIR}/../../../dev/cxgbe/firmware
+T4FW=	${.CURDIR}/../../../dev/cxgbe/firmware
 .PATH: ${T4FW}
 
-KMOD = t4fw_cfg
-FIRMWS = ${KMOD}.txt:${KMOD}:1.0.0.0
+KMOD=	t4fw_cfg
+FIRMWS=	${KMOD}.txt:${KMOD}:1.0.0.0
 
 # You can have additional configuration files in the ${T4FW} directory.
 # t4fw_cfg_<name>.txt
 CFG_FILES != cd ${T4FW} && echo ${KMOD}_*.txt
 .for F in ${CFG_FILES}
 .if exists(${F})
-FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
+FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T4FW_VER = 1.11.27.0
-FIRMWS += t4fw.fw:t4fw:${T4FW_VER}
-CLEANFILES += t4fw.fw
+T4FW_VER=	1.11.27.0
+FIRMWS+=	t4fw.fw:t4fw:${T4FW_VER}
+CLEANFILES+=	t4fw.fw
 
 t4fw.fw: t4fw-${T4FW_VER}.bin.uu
 	uudecode -o ${.TARGET} ${.ALLSRC}

Modified: head/sys/modules/cxgbe/t5_firmware/Makefile
==============================================================================
--- head/sys/modules/cxgbe/t5_firmware/Makefile	Fri Aug  1 00:00:54 2014	(r269363)
+++ head/sys/modules/cxgbe/t5_firmware/Makefile	Fri Aug  1 01:30:16 2014	(r269364)
@@ -2,24 +2,24 @@
 # $FreeBSD$
 #
 
-T5FW = ${.CURDIR}/../../../dev/cxgbe/firmware
+T5FW=	${.CURDIR}/../../../dev/cxgbe/firmware
 .PATH: ${T5FW}
 
-KMOD = t5fw_cfg
-FIRMWS = ${KMOD}.txt:${KMOD}:1.0.0.0
+KMOD=	t5fw_cfg
+FIRMWS=	${KMOD}.txt:${KMOD}:1.0.0.0
 
 # You can have additional configuration files in the ${T5FW} directory.
 # t5fw_cfg_<name>.txt
 CFG_FILES != cd ${T5FW} && echo ${KMOD}_*.txt
 .for F in ${CFG_FILES}
 .if exists(${F})
-FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
+FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T5FW_VER = 1.11.27.0
-FIRMWS += t5fw.fw:t5fw:${T5FW_VER}
-CLEANFILES += t5fw.fw
+T5FW_VER=	1.11.27.0
+FIRMWS+=	t5fw.fw:t5fw:${T5FW_VER}
+CLEANFILES+=	t5fw.fw
 
 t5fw.fw: t5fw-${T5FW_VER}.bin.uu
 	uudecode -o ${.TARGET} ${.ALLSRC}

Modified: head/sys/modules/cxgbe/tom/Makefile
==============================================================================
--- head/sys/modules/cxgbe/tom/Makefile	Fri Aug  1 00:00:54 2014	(r269363)
+++ head/sys/modules/cxgbe/tom/Makefile	Fri Aug  1 01:30:16 2014	(r269364)
@@ -4,13 +4,13 @@
 
 .include <src.opts.mk>
 
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE}/tom
 
-KMOD = t4_tom
-SRCS = t4_tom.c t4_connect.c t4_listen.c t4_cpl_io.c t4_tom_l2t.c t4_ddp.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h opt_inet6.h
+KMOD=	t4_tom
+SRCS=	t4_tom.c t4_connect.c t4_listen.c t4_cpl_io.c t4_tom_l2t.c t4_ddp.c
+SRCS+=	device_if.h bus_if.h pci_if.h
+SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${CXGBE}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408010130.s711UGEC055984>