diff options
| -rw-r--r-- | gas/ChangeLog.mpw | 8 | ||||
| -rw-r--r-- | gas/mpw-config.in | 9 | ||||
| -rw-r--r-- | gas/mpw-make.in | 43 |
3 files changed, 50 insertions, 10 deletions
diff --git a/gas/ChangeLog.mpw b/gas/ChangeLog.mpw index a0840f7..b6fe16d 100644 --- a/gas/ChangeLog.mpw +++ b/gas/ChangeLog.mpw @@ -1,3 +1,11 @@ +Fri Mar 17 16:48:12 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-config.in (TDEFINES): Put empty definition into + makefile fragment. + * mpw-make.in (xmalloc.c.o): Remove. + (as.new): Depend on Version.r. + (Version.r): Generate from version info. + Thu Jan 12 18:03:03 1995 Ken Raeburn <raeburn@cujo.cygnus.com> * mpw-make.in: Delete references to hex-value.c. diff --git a/gas/mpw-config.in b/gas/mpw-config.in index a6819f6..4005dc3 100644 --- a/gas/mpw-config.in +++ b/gas/mpw-config.in @@ -2,11 +2,11 @@ Set target_arch `echo {target_canonical} | sed -e 's/-.*-.*//'` -# The following works for many configurations ... +# The following works for many configurations, though not all. Set obj_format `echo {target_canonical} | sed -e 's/.*-.*-//'` -# ... but not all. +Set TDEFINES "" If "{target_canonical}" =~ /m68k-apple-macos/ Set obj_format "coff" @@ -41,8 +41,9 @@ Else forward-include "{srcdir}"config:atof-ieee.c atof-targ.c End If -Echo '# From mpw-config.in' > "{o}"mk.tmp +Echo '# From mpw-config.in' > "{o}"mk.tmp Echo 'VERSION = ' `Search 'VERSION=' "{srcdir}"Makefile.in | sed -e 's/.*VERSION=\(.*\)/\1/'` >> "{o}"mk.tmp +Echo "TDEFINES = " {TDEFINES} >> "{o}"mk.tmp -Echo '# End from mpw-config.in' >> "{o}"mk.tmp +Echo '# End from mpw-config.in' >> "{o}"mk.tmp diff --git a/gas/mpw-make.in b/gas/mpw-make.in index fc9a2b8..7dc5789 100644 --- a/gas/mpw-make.in +++ b/gas/mpw-make.in @@ -42,8 +42,8 @@ OBJECTS = \Option-d "{o}"subsegs.c.o \Option-d "{o}"symbols.c.o \Option-d "{o}"write.c.o \Option-d - "{o}"ecoff.c.o \Option-d - "{o}"xmalloc.c.o \Option-d + "{o}"ecoff.c.o + TARG_OBJECTS = "{o}"obj-format.c.o "{o}"targ-cpu.c.o "{o}"atof-targ.c.o @@ -59,10 +59,10 @@ CLIBS = ::libiberty:libiberty.o ::bfd:libbfd.o ::opcodes:libopcodes.o all \Option-f "{o}"config.h as.new -as.new \Option-f\Option-f {OBJECTS} {TARG_OBJECTS} {CLIBS} +as.new \Option-f\Option-f {OBJECTS} {TARG_OBJECTS} {CLIBS} "{o}"Version.r + Rez -rd -o as.new "{o}"Version.r -append Link {LDFLAGS} -o as.new {OBJECTS} {TARG_OBJECTS} {CLIBS} {EXTRALIBS} - "{o}"config.h \Option-f "{o}"config-stamp "{o}"config-stamp \Option-f Makefile @@ -104,10 +104,42 @@ as.new \Option-f\Option-f {OBJECTS} {TARG_OBJECTS} {CLIBS} Echo '#define HAVE_ERRNO_H' >> "{o}"config.new Echo '#define HAVE_STDARG_H' >> "{o}"config.new Echo '#define BFD_ASSEMBLER' >> "{o}"config.new - Echo '#endif /* GAS_VERSION */' >> "{o}"config.new + Echo '#endif /* GAS_VERSION */' >> "{o}"config.new MoveIfChange "{o}"config.new "{o}"config.h Echo ' ' >"{o}"config-stamp +"{o}"Version.r \Option-f "{o}"version-stamp + +"{o}"version-stamp \Option-f Makefile + Delete -i -y "{o}"version.new "{o}"version-stamp + Set major 0 + Set minor 0 + Set release 0 + Echo '/* Version resources. */' > "{o}"version.new + Echo '#include "SysTypes.r"' >> "{o}"version.new + Echo '' >> "{o}"version.new + Echo "resource 'vers' (1) " `open-brace` >> "{o}"version.new + Echo " {major}," >> "{o}"version.new + Echo " {minor}," >> "{o}"version.new + Echo " {release}," >> "{o}"version.new + Echo ' 0,' >> "{o}"version.new + Echo ' verUs,' >> "{o}"version.new + Echo ' "{VERSION}",' >> "{o}"version.new + Echo ' "{VERSION} (c) 1986-95 FSF, Inc. "' >> "{o}"version.new + Echo '};' >> "{o}"version.new + Echo '' >> "{o}"version.new + Echo "resource 'vers' (2, purgeable) " `open-brace` >> "{o}"version.new + Echo " {major}," >> "{o}"version.new + Echo " {minor}," >> "{o}"version.new + Echo " {release}," >> "{o}"version.new + Echo ' 0,' >> "{o}"version.new + Echo ' verUs,' >> "{o}"version.new + Echo ' "{VERSION}",' >> "{o}"version.new + Echo ' "GNU AS for MPW"' >> "{o}"version.new + Echo '};' >> "{o}"version.new + MoveIfChange "{o}"version.new "{o}"Version.r + Echo ' ' > "{o}"version-stamp + "{o}"app.c.o \Option-f "{s}"app.c {INCLUDES} "{o}"as.c.o \Option-f "{s}"as.c {INCLUDES} "{o}"atof-generic.c.o \Option-f "{s}"atof-generic.c {INCLUDES} @@ -129,7 +161,6 @@ as.new \Option-f\Option-f {OBJECTS} {TARG_OBJECTS} {CLIBS} "{o}"symbols.c.o \Option-f "{s}"symbols.c {INCLUDES} "{o}"write.c.o \Option-f "{s}"write.c {INCLUDES} "{o}"ecoff.c.o \Option-f "{s}"ecoff.c {INCLUDES} -"{o}"xmalloc.c.o \Option-f "{s}"xmalloc.c {INCLUDES} "{o}"targ-cpu.c.o \Option-f "{o}"targ-cpu.c {INCLUDES} "{o}"obj-format.c.o \Option-f "{o}"obj-format.c {INCLUDES} |