History

kbuild: finally remove the obsolete variable $TOPDIR

TOPDIR is obsolete, it can be finally removed now.

Amerigo Wang committed 17 years ago

Commit 11294231 parent c512d252 files · +2 −4Browse files

Unified · Split

2 files
  1. Makefile +1 −3
  2. drivers/scsi/cxgb3i/Kbuild +1 −1
Makefile+1−3
@@ -140,15 +140,13 @@ _all: modules · 139 unmodified lines
140endif140endif
141 141
142srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))142srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
143TOPDIR := $(srctree)
144# FIXME - TOPDIR is obsolete, use srctree/objtree
145objtree := $(CURDIR)143objtree := $(CURDIR)
146src := $(srctree)144src := $(srctree)
147obj := $(objtree)145obj := $(objtree)
148 146
149VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))147VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
150 148
151export srctree objtree VPATH TOPDIR149export srctree objtree VPATH
152 150
153 151
154# SUBARCH tells the usermode build what the underlying arch is. That is set152# SUBARCH tells the usermode build what the underlying arch is. That is set
drivers/scsi/cxgb3i/Kbuild+1−1
@@ -1,4 +1,4 @@
1EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb31EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
2 2
3cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o3cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
4obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o4obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o