[Patch] kbuild: finally remove the obsolete variable $TOPDIR

[Patch] kbuild: finally remove the obsolete variable $TOPDIR

[Amerigo Wang]

TOPDIR is obsolete, it can be finally removed now.

Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Sam <sam@ravnborg.org>

---
diff --git a/Makefile b/Makefile
index 46e1c9d..6e41628 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 25a2032..70d060b 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

Re: [Patch] kbuild: finally remove the obsolete variable $TOPDIR

[Amerigo Wang]

On Fri, Jun 19, 2009 at 03:40:26AM -0400, Amerigo Wang wrote:
>
>TOPDIR is obsolete, it can be finally removed now.
>
>Signed-off-by: WANG Cong <amwang@redhat.com>
>Cc: Sam <sam@ravnborg.org>

ping Sam...


>
>---
>diff --git a/Makefile b/Makefile
>index 46e1c9d..6e41628 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 25a2032..70d060b 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
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at  http://www.tux.org/lkml/

Re: [Patch] kbuild: finally remove the obsolete variable $TOPDIR

[Sam Ravnborg]

On Tue, Jun 30, 2009 at 05:06:39PM +0800, Amerigo Wang wrote:
> On Fri, Jun 19, 2009 at 03:40:26AM -0400, Amerigo Wang wrote:
> >
> >TOPDIR is obsolete, it can be finally removed now.
> >
> >Signed-off-by: WANG Cong <amwang@redhat.com>
> >Cc: Sam <sam@ravnborg.org>
> 
> ping Sam...
http://git.kernel.org/?p=linux/kernel/git/sam/kbuild-fixes.git;a=commit;h=112942353992d95099fb5b71c679ff1046fccfcf

Seems I forgot to send you an "applied" mail.

	Sam

Re: [Patch] kbuild: finally remove the obsolete variable $TOPDIR

[Amerigo Wang]

On Tue, Jun 30, 2009 at 11:16:38AM +0200, Sam Ravnborg wrote:
>On Tue, Jun 30, 2009 at 05:06:39PM +0800, Amerigo Wang wrote:
>> On Fri, Jun 19, 2009 at 03:40:26AM -0400, Amerigo Wang wrote:
>> >
>> >TOPDIR is obsolete, it can be finally removed now.
>> >
>> >Signed-off-by: WANG Cong <amwang@redhat.com>
>> >Cc: Sam <sam@ravnborg.org>
>> 
>> ping Sam...
>http://git.kernel.org/?p=linux/kernel/git/sam/kbuild-fixes.git;a=commit;h=112942353992d95099fb5b71c679ff1046fccfcf
>
>Seems I forgot to send you an "applied" mail.
>

No problem. Thanks!