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>

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>
Amerigo Wang · Sam Ravnborg
1 parent c512d2544c
Showing 2 changed files with 2 additions and 4 deletions Side-by-side Diff
Makefile
drivers/scsi/cxgb3i/Kbuild
@@ -140,15 +140,13 @@
 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
-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
...	...	@@ -140,15 +140,13 @@
140	140	endif
141	141
142	142	srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
143		-TOPDIR := $(srctree)
144		-# FIXME - TOPDIR is obsolete, use srctree/objtree
145	143	objtree := $(CURDIR)
146	144	src := $(srctree)
147	145	obj := $(objtree)
148	146
149	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	152	# SUBARCH tells the usermode build what the underlying arch is. That is set
1		-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3
	1	+EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
2	2
3	3	cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
4	4	obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o