From 8422d274a7c0595cba26cc675fd5b5a3aad97755 Mon Sep 17 00:00:00 2001 From: michaelw Date: Wed, 26 Jul 2000 20:47:21 +0000 Subject: [PATCH] [project @ 2000-07-26 20:47:21 by michaelw] * backup files are only generated, if there is an old dependency file. * if $Makefile is "-", print dependencies to STDOUT *without* creating a backup file. *** MERGE with 4.08.1 *** --- ghc/utils/mkdependHS/mkdependHS.prl | 77 ++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl index 6548101..47ec677 100644 --- a/ghc/utils/mkdependHS/mkdependHS.prl +++ b/ghc/utils/mkdependHS/mkdependHS.prl @@ -176,41 +176,60 @@ foreach $sf (@Src_files) { } } - # -# Create backup version of output file. -# -if ( ! -f $Makefile ) { - # truncate() may not be implemented, so we - # play it safe here. - local(*TRUNC); - open(TRUNC,"> $Makefile.bak") && close(TRUNC); +# print dependencies +# +if ( $Makefile eq "-" ) { + # + # print dependencies to STDOUT + # + &print_deps(); +} elsif ( ! -f $Makefile ) { + # + # $Makefile does not exist, just print the deps. + # + open(NMKF,"> $Makefile") || die "$Pgm: can't open $Makefile: $!\n"; + select(NMKF); + &print_deps(); + close(NMKF); } else { - rename($Makefile,"$Makefile.bak"); -} -# now copy Makefile.bak into Makefile, rm'ing old dependencies -# and adding the new -open(OMKF,"< $Makefile.bak") || die "$Pgm: can't open $Makefile.bak: $!\n"; -open(NMKF,"> $Makefile") || die "$Pgm: can't open $Makefile: $!\n"; -select(NMKF); -$_ = ; -while ($_ && $_ ne $Begin_magic_str) { # copy through, 'til Begin_magic_str - print $_; - $_ = ; -} -while ($_ && $_ ne $End_magic_str) { # delete 'til End_magic_str - $_ = ; -} -# insert dependencies -print "$Begin_magic_str", @Depend_lines, $End_magic_str || die "Failed to write out dependencies ($!)"; + # + # Create backup version of output file, then generate a new one. + # + rename($Makefile,"$Makefile.bak") || die "$Pgm: can't rename $Makefile: $!\n"; + + # now copy Makefile.bak into Makefile, rm'ing old dependencies + # and adding the new + open(OMKF,"< $Makefile.bak") || die "$Pgm: can't open $Makefile.bak: $!\n"; + open(NMKF,"> $Makefile") || die "$Pgm: can't open $Makefile: $!\n"; + select(NMKF); + + $_ = ; + while ($_ && $_ ne $Begin_magic_str) { # copy through, 'til Begin_magic_str + print $_; + $_ = ; + } + while ($_ && $_ ne $End_magic_str) { # delete 'til End_magic_str + $_ = ; + } -while () { # copy the rest through - print $_ || die "Failed to write out dependencies ($!)"; + &print_deps(); + + while () { # copy the rest through + print $_ || die "Failed to write out dependencies ($!)"; + } + close(NMKF) || exit(1); + close(OMKF) || exit(1); } -close(NMKF) || exit(1); -close(OMKF) || exit(1); + exit 0; + +sub print_deps { + # insert dependencies + print "$Begin_magic_str", @Depend_lines, $End_magic_str || die "Failed to write out dependencies ($!)"; +} + sub mangle_command_line_args { local(@Args) = @_; -- 1.7.10.4