summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2009-06-19 03:40:26 -0400
committerSam Ravnborg <sam@ravnborg.org>2009-06-27 00:27:17 +0200
commit112942353992d95099fb5b71c679ff1046fccfcf (patch)
treef7cfe5f0880d18914ac02a806c53e5297e251925
parentc512d2544c688ff1fab18a530860a9c7440a71b7 (diff)
downloadlwn-112942353992d95099fb5b71c679ff1046fccfcf.tar.gz
lwn-112942353992d95099fb5b71c679ff1046fccfcf.zip
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--Makefile4
-rw-r--r--drivers/scsi/cxgb3i/Kbuild2
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8fb9bfce212c..b4c7ef5ab431 100644
--- a/Makefile
+++ b/Makefile
@@ -140,15 +140,13 @@ _all: modules
endif
srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
-TOPDIR := $(srctree)
-# FIXME - TOPDIR is obsolete, use srctree/objtree
objtree := $(CURDIR)
src := $(srctree)
obj := $(objtree)
VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
-export srctree objtree VPATH TOPDIR
+export srctree objtree VPATH
# 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 @@
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o