diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-09-04 19:11:21 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-09-04 19:11:21 +0000 |
| commit | c3c8d76890b592bf5acc1a9b7faeabd9b829dd71 (patch) | |
| tree | 6358a23d0df9de73b6d5d6d3a75545ff35f05b47 /gnu/usr.bin/binutils/bfd/mpw-make.sed | |
| parent | 4ba440a6e788da3a64fa29b782c37150a3f5cc18 (diff) | |
Merge the Cygnus 960904 sources
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/mpw-make.sed')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/mpw-make.sed | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gnu/usr.bin/binutils/bfd/mpw-make.sed b/gnu/usr.bin/binutils/bfd/mpw-make.sed index a989ef005ff..72485694d79 100644 --- a/gnu/usr.bin/binutils/bfd/mpw-make.sed +++ b/gnu/usr.bin/binutils/bfd/mpw-make.sed @@ -4,13 +4,16 @@ /HDEFINES/s/@HDEFINES@// /TDEFINES/s/@TDEFINES@// -/INCDIR=/s/"{srcdir}":/"{topsrcdir}"/ -/^CSEARCH = .*$/s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/ +# Fix pathnames to include directories. +/^INCDIR = /s/^INCDIR = .*$/INCDIR = "{topsrcdir}"include/ +/^CSEARCH = /s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/ -/WORDSIZE/s/^WORDSIZE = /#WORDSIZE = / -/BFD_MACHINES/s/^BFD_MACHINES = /#BFD_MACHINES = / -/BFD_BACKENDS/s/^BFD_BACKENDS = /#BFD_BACKENDS = / -/TDEFAULTS/s/^TDEFAULTS = /#TDEFAULTS = / +# Comment out setting of vars, configure script will add these itself. +/^WORDSIZE =/s/^/#/ +# /^ALL_BACKENDS/s/^/#/ +/^BFD_BACKENDS/s/^/#/ +/^BFD_MACHINES/s/^/#/ +/^TDEFAULTS/s/^/#/ # Remove extra, useless, "all". /^all \\Option-f _oldest/,/^$/d @@ -27,7 +30,9 @@ /bfd/s/"{s}"bfd\.h/"{o}"bfd.h/g /config/s/"{s}"config\.h/"{o}"config.h/g /elf32-target/s/"{s}"elf32-target\.h/"{o}"elf32-target.h/g +/elf32-target/s/^elf32-target\.h/"{o}"elf32-target.h/ /elf64-target/s/"{s}"elf64-target\.h/"{o}"elf64-target.h/g +/elf64-target/s/^elf64-target\.h/"{o}"elf64-target.h/ /"{s}"{INCDIR}/s/"{s}"{INCDIR}/"{INCDIR}"/g @@ -57,11 +62,11 @@ # MPW Make doesn't know about $<. /"{o}"targets.c.o \\Option-f "{s}"targets.c Makefile/,/^$/c\ "{o}"targets.c.o \\Option-f "{s}"targets.c Makefile\ - {CC} {ALL_CFLAGS} {TDEFAULTS} "{s}"targets.c -o "{o}"targets.c.o + {CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"targets.c -o "{o}"targets.c.o /"{o}"archures.c.o \\Option-f "{s}"archures.c Makefile/,/^$/c\ "{o}"archures.c.o \\Option-f "{s}"archures.c Makefile\ - {CC} {ALL_CFLAGS} {TDEFAULTS} "{s}"archures.c -o "{o}"archures.c.o + {CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"archures.c -o "{o}"archures.c.o # Remove the .h rebuilding rules, we don't currently have a doc subdir, # or a way to build the prototype-hacking tool that's in it. |