diff options
| author | sof <unknown> | 2004-08-25 17:38:36 +0000 |
|---|---|---|
| committer | sof <unknown> | 2004-08-25 17:38:36 +0000 |
| commit | 9845dda88d851a40ceb8c1e25b64effaa8da1d38 (patch) | |
| tree | 7f0a479b9f2c64fd67c97ee756853f93913975a2 /glafp-utils/mkdependC/mkdependC.prl | |
| parent | 26a76eba7dd1b3b4bfeabb8a5228ca2328b1169c (diff) | |
| download | haskell-9845dda88d851a40ceb8c1e25b64effaa8da1d38.tar.gz | |
[project @ 2004-08-25 17:38:36 by sof]
tidy up EOL termination handling under mingw; as was, C-related dependencies were being accumulated in existing dependency files, not replaced
Diffstat (limited to 'glafp-utils/mkdependC/mkdependC.prl')
| -rw-r--r-- | glafp-utils/mkdependC/mkdependC.prl | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/glafp-utils/mkdependC/mkdependC.prl b/glafp-utils/mkdependC/mkdependC.prl index b8f853ab03..f7af53ac3c 100644 --- a/glafp-utils/mkdependC/mkdependC.prl +++ b/glafp-utils/mkdependC/mkdependC.prl @@ -13,8 +13,8 @@ $Status = 0; # just used for exit() status $Verbose = 0; $Dashdashes_seen = 0; -$Begin_magic_str = "# DO NOT DELETE: Beginning of C dependencies\n"; -$End_magic_str = "# DO NOT DELETE: End of C dependencies\n"; +$Begin_magic_str = "# DO NOT DELETE: Beginning of C dependencies"; +$End_magic_str = "# DO NOT DELETE: End of C dependencies"; $Obj_suffix = 'o'; @Defines = (); $Include_dirs = ''; @@ -72,6 +72,15 @@ foreach $sf (@Src_files) { &slurp_file($sf, 'fh00'); } +# Tiresome EOL termination issues +if ( ${BUILDPLATFORM} eq "i386-unknown-mingw32" ) { + $Begin_magic_str = $Begin_magic_str . "\r\n"; + $End_magic_str = $End_magic_str . "\r\n"; +} else { + $Begin_magic_str = $Begin_magic_str . "\n"; + $End_magic_str = $End_magic_str . "\n"; +} + # OK, mangle the Makefile unlink("$Makefile.bak"); rename($Makefile,"$Makefile.bak"); @@ -125,9 +134,9 @@ sub mangle_command_line_args { local($suff) = &grab_arg_arg($_); push(@File_suffix, $suff); } elsif ( /^-bs/ ) { - $Begin_magic_str = &grab_arg_arg($_) . "\n"; + $Begin_magic_str = &grab_arg_arg($_); } elsif ( /^-es/ ) { - $End_magic_str = &grab_arg_arg($_) . "\n"; + $End_magic_str = &grab_arg_arg($_); } elsif ( /^-w/ ) { $Width = &grab_arg_arg($_); } elsif ( /^-/ ) { |