1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00

Do not clean input file. This would write to the $(srcdir) during a

VPATH build, which is not allowed.  It also isn't needed since it only
works when an output filename has been specified and in that case we
don't need to clean the input file because the output file will
already exist.
This commit is contained in:
Marius Vollmer 2002-04-17 17:44:28 +00:00
parent a3451a590e
commit 9d2cce766d
2 changed files with 15 additions and 15 deletions

View file

@ -1,3 +1,16 @@
2002-04-17 Marius Vollmer <mvo@zagadka.ping.de>
* Makefile.am (EXTRA_DIST): Added cpp_err_symbols.c and
cpp_sig_symbols.c.
2002-04-16 Marius Vollmer <mvo@zagadka.ping.de>
* guile-snarf.in: Do not clean input file. This would write to
the $(srcdir) during a VPATH build, which is not allowed. It also
isn't needed since it only works when an output filename has been
specified and in that case we don't need to clean the input file
because the output file will already exist.
2002-03-31 Marius Vollmer <mvo@zagadka.ping.de> 2002-03-31 Marius Vollmer <mvo@zagadka.ping.de>
* guile-snarf: Install the trap for removing $cleanfile only when * guile-snarf: Install the trap for removing $cleanfile only when

View file

@ -24,11 +24,7 @@
# #
# Process INFILE using the C pre-processor and some other programs. # Process INFILE using the C pre-processor and some other programs.
# Write output to a file named OUTFILE or to the standard output when no # Write output to a file named OUTFILE or to the standard output when no
# OUTFILE has been specified or when OUTFILE is "-". When writing # OUTFILE has been specified or when OUTFILE is "-".
# to a file, ignore lines from the input matching the following grep(1)
# regular expression:
#
# ^#include ".*OUTFILE"
# #
# If there are errors during processing, delete OUTFILE and exit with # If there are errors during processing, delete OUTFILE and exit with
# non-zero status. # non-zero status.
@ -110,16 +106,7 @@ if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
trap "rm -f $temp" 0 1 2 15 trap "rm -f $temp" 0 1 2 15
if [ ! "$outfile" = "-" ]; then if [ ! "$outfile" = "-" ]; then
self_blind_regexp='^#include ".*'`basename $outfile`'"' modern_snarf "$@" $infile > $outfile
clean_infile=$infile.clean.c # temp file in same dir as infile
# so that #include "foo" works
# (e.g., see libguile/eval.c).
# use .c to satisfy cpp heuristics.
# clean input file
trap "rm -f $cleanfile" 0 1 2 15
grep -v "$self_blind_regexp" $infile > $clean_infile
modern_snarf "$@" $clean_infile > $outfile
else else
modern_snarf "$@" $infile modern_snarf "$@" $infile
fi fi