diff options
author | Amerigo Wang <amwang@redhat.com> | 2009-06-19 03:40:26 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-06-26 18:27:17 -0400 |
commit | 112942353992d95099fb5b71c679ff1046fccfcf (patch) | |
tree | f7cfe5f0880d18914ac02a806c53e5297e251925 | |
parent | c512d2544c688ff1fab18a530860a9c7440a71b7 (diff) |
kbuild: finally remove the obsolete variable $TOPDIR
TOPDIR is obsolete, it can be finally removed now.
Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | drivers/scsi/cxgb3i/Kbuild | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -140,15 +140,13 @@ _all: modules | |||
140 | endif | 140 | endif |
141 | 141 | ||
142 | srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) | 142 | srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) |
143 | TOPDIR := $(srctree) | ||
144 | # FIXME - TOPDIR is obsolete, use srctree/objtree | ||
145 | objtree := $(CURDIR) | 143 | objtree := $(CURDIR) |
146 | src := $(srctree) | 144 | src := $(srctree) |
147 | obj := $(objtree) | 145 | obj := $(objtree) |
148 | 146 | ||
149 | VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) | 147 | VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) |
150 | 148 | ||
151 | export srctree objtree VPATH TOPDIR | 149 | export srctree objtree VPATH |
152 | 150 | ||
153 | 151 | ||
154 | # SUBARCH tells the usermode build what the underlying arch is. That is set | 152 | # SUBARCH tells the usermode build what the underlying arch is. That is set |
diff --git a/drivers/scsi/cxgb3i/Kbuild b/drivers/scsi/cxgb3i/Kbuild index 25a2032bfa26..70d060b7ff4f 100644 --- a/drivers/scsi/cxgb3i/Kbuild +++ b/drivers/scsi/cxgb3i/Kbuild | |||
@@ -1,4 +1,4 @@ | |||
1 | EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3 | 1 | EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3 |
2 | 2 | ||
3 | cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o | 3 | cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o |
4 | obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o | 4 | obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o |