X-Spam-Checker-Version: SpamAssassin 3.3.0-rupdated (updated) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63, J_CHICKENPOX_65,J_CHICKENPOX_66 autolearn=no version=3.3.0-rupdated Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id n3GJvVc2088393 for ; Thu, 16 Apr 2009 14:57:46 -0500 X-ASG-Debug-ID: 1239911971-26b200bd0000-NocioJ X-Barracuda-URL: http://cuda.sgi.com:80/cgi-bin/mark.cgi Received: from bombadil.infradead.org (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id B96C71429700 for ; Thu, 16 Apr 2009 12:59:31 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) by cuda.sgi.com with ESMTP id 9W0Macjkz4NHMfPT for ; Thu, 16 Apr 2009 12:59:31 -0700 (PDT) X-ASG-Whitelist: Client Received: from hch by bombadil.infradead.org with local (Exim 4.69 #1 (Red Hat Linux)) id 1LuXhy-0000Ty-8y; Thu, 16 Apr 2009 19:57:14 +0000 Date: Thu, 16 Apr 2009 15:57:14 -0400 From: Christoph Hellwig To: xfs@oss.sgi.com Cc: Andreas Gruenbacher X-ASG-Orig-Subj: [PATCH] xfsprogs: keep autoconf-generated files over make distclean Subject: [PATCH] xfsprogs: keep autoconf-generated files over make distclean Message-ID: <20090416195713.GB22431@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html X-Barracuda-Connect: bombadil.infradead.org[18.85.46.34] X-Barracuda-Start-Time: 1239911971 X-Barracuda-Virus-Scanned: by cuda.sgi.com at sgi.com X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on oss.sgi.com X-Virus-Status: Clean We do want to ship the autoconf-generated files over make distclean and pick them up in Makepkgs so that a user compiling the program doesn't require autoconf. For that split up make distclean from make realclean and exclude the files we want to keep form the former. To make this easier to maintain adher to stricter rules of use for CONFIGURE and LDIRT. CONFIGURE now includes all generated files from autoconf (or for it like our copied install-sh) and gets only removed on make realclean, but added to LSRCFILES so that Makepkgs can pick it up. Everything else than needs to be removed on a realclean gets assigned to LDIRT. Signed-off-by: Christoph Hellwig Index: xfsprogs-dev/Makefile =================================================================== --- xfsprogs-dev.orig/Makefile 2009-04-16 21:33:57.186074648 +0200 +++ xfsprogs-dev/Makefile 2009-04-16 21:37:48.950076935 +0200 @@ -10,13 +10,14 @@ include $(TOPDIR)/include/builddefs endif CONFIGURE = aclocal.m4 configure config.guess config.sub \ + libtool configure install-sh \ + include/builddefs include/platform_defs.h \ ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ - m4/ltversion.m4 m4/lt~obsolete.m4 \ - include/builddefs include/platform_defs.h -LSRCFILES = configure.in Makepkgs install-sh README VERSION $(CONFIGURE) + m4/ltversion.m4 m4/lt~obsolete.m4 +LSRCFILES = configure.in Makepkgs README VERSION $(CONFIGURE) LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ - Logs/* built .census install.* install-dev.* *.gz + Logs/* built .census install.* install-dev.* *.gz autom4te.cache/* LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \ @@ -96,7 +97,8 @@ install-qa: install $(addsuffix -install %-install-qa: $(MAKE) -C $* install-qa -realclean distclean: clean - rm -f $(LDIRT) $(CONFIGURE) - rm -f include/builddefs include/config.h install-sh libtool - rm -rf autom4te.cache Logs +distclean: clean + rm -f $(LDIRT) + +realclean: distclean + rm -f $(CONFIGURE)