Re: VPATH rebuilding of gawk

[Aharon Robbins]

OK, I've applied these. They'll be showing up soon in the CVS.

Arnold

> Date: Sun, 03 Dec 2006 17:21:55 +0100
> From: Ralf Wildenhues <address@hidden>
> Subject: Re: VPATH rebuilding of gawk
> To: Andreas Schwab <address@hidden>
> Cc: address@hidden
>
> * Andreas Schwab wrote on Sun, Dec 03, 2006 at 11:29:04AM CET:
> > Ralf Wildenhues <address@hidden> writes:
> > 
> > > stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
>
> > You should also change the target to $(srcdir)/stamp-eg, since that is
> > what is actually created by the commands.
>
> That's not strictly necessary.  And even less now that the INSTALL file
> of recent Automake recommends GNU make in case of trouble.  But if it's
> changed, it needs to be changed everywhere.  Updated patch below.
>
> Cheers,
> Ralf
>
> awklib/ChangeLog:
> 2006-12-03  Ralf Wildenhues  <address@hidden>
>
>       * Makefile.am (stamp-eg): Allow rebuilding from a VPATH build.
>
> test/ChangeLog:
> 2006-12-03  Ralf Wildenhues  <address@hidden>
>
>       * Makefile.am (Maketests): Allow rebuilding from a VPATH build.
>
> Index: awklib/Makefile.am
> ===================================================================
> RCS file: /cvsroot/gawk/gawk-stable/awklib/Makefile.am,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile.am
> --- awklib/Makefile.am        11 Aug 2006 13:14:35 -0000      1.2
> +++ awklib/Makefile.am        3 Dec 2006 16:21:17 -0000
> @@ -1,7 +1,7 @@
>  #
>  # awklib/Makefile.am --- automake input file for gawk
>  #
> -# Copyright (C) 1995-2005 the Free Software Foundation, Inc.
> +# Copyright (C) 1995-2006 the Free Software Foundation, Inc.
>  #
>  # This file is part of GAWK, the GNU implementation of the
>  # AWK Programming Language.
> @@ -23,7 +23,7 @@
>  
>  ## process this file with automake to produce Makefile.in
>  
> -EXTRA_DIST = ChangeLog extract.awk eg stamp-eg
> +EXTRA_DIST = ChangeLog extract.awk eg $(srcdir)/stamp-eg
>  
>  # Get config.h from the build directory and custom.h from the source 
> directory.
>  AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
> @@ -37,7 +37,7 @@
>  nodist_grcat_SOURCES = grcat.c
>  nodist_pwcat_SOURCES = pwcat.c
>  
> -all: stamp-eg $(AUXPROGS) igawk $(AUXAWK)
> +all: $(srcdir)/stamp-eg $(AUXPROGS) igawk $(AUXAWK)
>  
>  install-exec-hook: $(AUXAWK)
>       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
> @@ -54,12 +54,14 @@
>  clean-local:
>       rm -f $(AUXAWK) igawk *.exe
>  
> -stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
> -     mv eg eg.old
> -     rm -fr  stamp-eg
> -     $(AWK) -f $(srcdir)/extract.awk $(srcdir)/../doc/gawk.texi 
> $(srcdir)/../doc/gawkinet.texi
> -     @echo 'some makes are stupid and will not check a directory' > stamp-eg
> -     @echo 'against a file, so this file is a place holder. gack.' >> 
> stamp-eg
> +$(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
> +     cd $(srcdir) && \
> +     mv eg eg.old && \
> +     rm -fr  stamp-eg && \
> +     $(AWK) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
> +     @echo 'some makes are stupid and will not check a directory' > 
> $(srcdir)/stamp-eg
> +     @echo 'against a file, so this file is a place holder. gack.' >> 
> $(srcdir)/stamp-eg
> +     cd $(srcdir) && \
>       if [ -d eg.old ] && [ -d eg.old/CVS ] ; then \
>       mv eg.old/CVS eg ; \
>       mv eg.old/data/CVS eg/data ; \
> Index: test/Makefile.am
> ===================================================================
> RCS file: /cvsroot/gawk/gawk-stable/test/Makefile.am,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile.am
> --- test/Makefile.am  5 Sep 2006 23:10:55 -0000       1.3
> +++ test/Makefile.am  3 Dec 2006 16:21:18 -0000
> @@ -1,7 +1,7 @@
>  #
>  # test/Makefile.am --- automake input file for gawk
>  #
> -# Copyright (C) 1988-2005 the Free Software Foundation, Inc.
> +# Copyright (C) 1988-2006 the Free Software Foundation, Inc.
>  #
>  # This file is part of GAWK, the GNU implementation of the
>  # AWK Programming Language.
> @@ -1025,7 +1031,8 @@
>  include Maketests
>  
>  $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
> -     $(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" *.awk *.in > 
> $(srcdir)/Maketests
> +     files=`cd "$(srcdir)" && echo *.awk *.in`; \
> +     $(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > 
> $(srcdir)/Maketests
>  
>  clean:
>       rm -fr _* core core.* junk out1 out2 out3 strftime.ok test1 test2 seq *~