[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH][RESEND] Fix 'make extraclean' for VPATH builds

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2005-10-21 15:54:18 CEST

Hello list,

I know you're all busy sorting out 1.3.0, but has anyone got any comments
about the (fairly trivial) patch below, which was posted here two weeks
ago without comment?


----- Forwarded message from Malcolm Rowe <malcolm-svn-dev@farside.org.uk> -----

From: Malcolm Rowe <malcolm-svn-dev@farside.org.uk>
To: Max Bowsher <maxb@ukf.net>
Cc: dev@subversion.tigris.org
Subject: [PATCH] Fix 'make extraclean' for VPATH builds
Date: Fri, 7 Oct 2005 11:51:23 +0100

On Thu, Oct 06, 2005 at 01:16:31PM +0100, Malcolm Rowe wrote:
> Hm, while we're here, I think that all the 'make extraclean' targets
> need to be prefixed with $(top_srcdir), because currently it'll fail
> for VPATH builds (though the concept of 'make extraclean' is a bit dubious
> for a VPATH build anyway, I guess).

See attached patch, which does just that. If we're not going to disallow
'make extraclean' for VPATH builds, we might as well fix it to delete
the files from the correct location.

I also noticed that we no longer need to remove ac-helpers/ltconfig,
since it no longer exists (it dates from libtool 1.3, pre-r212), so the
patch also removes that from the list of files to delete and removes it
from svn:ignore in ac-helpers/. I realise that this could be considered
to be combining two separate changes, but they're both in exactly the
same area and it seemed to me that splitting them would be completely
over-the-top, even to someone as anal as myself.

[The property change to svn:ignore will have to be applied manually, of
course, but there didn't seem any harm in leaving the text in the patch.]

* Makefile.in
  (local-extraclean): Fix 'make extraclean' in a VPATH build: remove
    generated files from the srcdir, where they are, not the build dir, where
    they're not. Also, stop trying to remove ac-helpers/ltconfig, which
    hasn't been generated since before r212.

* ac-helpers/
  Remove 'ltconfig' from the svn:ignore list.


Index: Makefile.in
--- Makefile.in (revision 16568)
+++ Makefile.in (working copy)
@@ -325,10 +325,13 @@
 # clean everything out, returning to before './autogen.sh' was run.
 local-extraclean: local-distclean
- rm -f build-outputs.mk subversion/svn_private_config.h.in configure \
- ac-helpers/config.guess ac-helpers/config.sub \
- ac-helpers/libtool.m4 ac-helpers/ltconfig \
- ac-helpers/ltmain.sh
+ rm -f $(top_srcdir)/build-outputs.mk \
+ $(top_srcdir)/subversion/svn_private_config.h.in \
+ $(top_srcdir)/configure \
+ $(top_srcdir)/ac-helpers/config.guess \
+ $(top_srcdir)/ac-helpers/config.sub \
+ $(top_srcdir)/ac-helpers/libtool.m4 \
+ $(top_srcdir)/ac-helpers/ltmain.sh
 # clean everything, including test output.
 local-clean: fast-clean check-clean clean-swig

Property changes on: ac-helpers
Name: svn:ignore
   - config.guess

   + config.guess

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

----- End forwarded message -----


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 21 15:56:24 2005

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.