Skip to contentSkip to conversation

kbuild: finally remove the obsolete variable $TOPDIR

PATCH In review Amerigo Wang 3 participants 4 messages Jun 19, 2009 – Jun 30, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: finally remove the obsolete variable $TOPDIR

TOPDIR is obsolete, it can be finally removed now.

---

Makefile +1 -3
index 46e1c9d..6e41628 100644
@@ -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
drivers/scsi/cxgb3i/Kbuild +1 -1
index 25a2032..70d060b 100644
@@ -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
#1 lore raw
Quoted 5 lines · Amerigo Wang

TOPDIR is obsolete, it can be finally removed now.

ping Sam...

Quoted 38 lines

---

Makefile +0 -0
index 46e1c9d..6e41628 100644
@@ -140,15 +140,13 @@ _all: modules

endif

srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))

Makefile +0 -2
-TOPDIR		:= $(srctree)
-# FIXME - TOPDIR is obsolete, use srctree/objtree

objtree := $(CURDIR)
src := $(srctree)
obj := $(objtree)

VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))

Makefile +1 -1
-export srctree objtree VPATH TOPDIR
+export srctree objtree VPATH

# SUBARCH tells the usermode build what the underlying arch is. That is set

drivers/scsi/cxgb3i/Kbuild +1 -1
index 25a2032..70d060b 100644
@@ -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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/