xfs-masters
[Top] [All Lists]

[xfs-masters] (Try #2) [Patch 7/8] FS: Drop 'TOPDIR' from Makefiles and

To: Sam Ravnborg <sam@xxxxxxxxxxxx>
Subject: [xfs-masters] (Try #2) [Patch 7/8] FS: Drop 'TOPDIR' from Makefiles and remove some dead code
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Date: Tue, 1 Jan 2008 22:28:52 +0800
Cc: WANG Cong <xiyou.wangcong@xxxxxxxxx>, Tim Shimmin <xfs-masters@xxxxxxxxxxx>, LKML <linux-kernel@xxxxxxxxxxxxxxx>, linux-kbuild@xxxxxxxxxxxxxxx, Andrew Morton <akpm@xxxxxxxx>, viro@xxxxxxxxxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject:message-id:reply-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; bh=nxWYv8KIZD2ysqXjhP7nB6p2WZjY/ckXnFsXP41pS9I=; b=AOch4+tbZ6paezBLBRqDd6kqZx9hi9fuCVcq3OwMrSuLrFsviGAkUqeX5BUr4vSosHx+EgmHm5sPaISkwNfZcNEdz3TOaZGMnf3aNT2PBXXoDhv39WMXhZA5Q7xIiSBEl93jzWbz5jvFeXGSmUgS+ApmNxW9TG7otmMaEON7kHM=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=kswFYJSO2YgD8hkEXFHFod67MIBlH5Xz//7n/jPv318AnV4S9z+I54d7kbb8u7+T/pAkKbRLZ82X/B47RLqDaWolS/WCy6kChctYm6rFlvCGX2JusN0cvXloSlzZYmu1jnk03yuljI33EWxoXOS0HAfIosfsuBhCV5k3S1h23T8=
In-reply-to: <20080101103026.GG28913@uranus.ravnborg.org>
References: <20080101071311.GA2496@hacking> <20080101074105.GH2496@hacking> <20080101103026.GG28913@uranus.ravnborg.org>
Reply-to: xfs-masters@xxxxxxxxxxx
Sender: xfs-masters-bounce@xxxxxxxxxxx
User-agent: Mutt/1.5.14 (2007-02-12)
>
>The whole "Maintainer rules" part of this file should be deleted.
>I cannot see how it can be used anyway.

Agreed.

I delete them all and renew the patch.
Passed compiling test.

--------->

This patch drops TOPDIR since it's obsolete and removes
some dead code from fs/smbfs/Makefile.

Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Tim Shimmin <xfs-masters@xxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>

---

diff --git a/fs/smbfs/Makefile b/fs/smbfs/Makefile
index 6673ee8..4faf8c4 100644
--- a/fs/smbfs/Makefile
+++ b/fs/smbfs/Makefile
@@ -16,23 +16,3 @@ EXTRA_CFLAGS += -DSMBFS_PARANOIA
 #EXTRA_CFLAGS += -DDEBUG_SMB_TIMESTAMP
 #EXTRA_CFLAGS += -Werror
 
-#
-# Maintainer rules
-#
-
-# getopt.c not included. It is intentionally separate
-SRC = proc.c dir.c cache.c sock.c inode.c file.c ioctl.c smbiod.c request.c \
-       symlink.c
-
-proto:
-       -rm -f proto.h
-       @echo >  proto2.h "/*"
-       @echo >> proto2.h " *  Autogenerated with cproto on: " `date`
-       @echo >> proto2.h " */"
-       @echo >> proto2.h ""
-       @echo >> proto2.h "struct smb_request;"
-       @echo >> proto2.h "struct sock;"
-       @echo >> proto2.h "struct statfs;"
-       @echo >> proto2.h ""
-       cproto -E "gcc -E" -e -v -I $(TOPDIR)/include -DMAKING_PROTO 
-D__KERNEL__ $(SRC) >> proto2.h
-       mv proto2.h proto.h
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 49e3e7e..d1d3d49 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -1 +1 @@
-include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)
+include $(objtree)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)


<Prev in Thread] Current Thread [Next in Thread>