generating .o files

diff --git a/mach/z80/libbc/Makefile b/mach/z80/libbc/Makefile
index 0b0b4e7..2286d7b 100644 (file)
--- a/mach/z80/libbc/Makefile
+++ b/mach/z80/libbc/Makefile
@@ -1,5 +1,6 @@
+SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=z80" "SUF=s"
+MACHDEF="MACH=z80" "SUF=$(SUF)" "ASAR=aal"
 BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib"
 
 install:

diff --git a/mach/z80/libbc/compmodule b/mach/z80/libbc/compmodule
index 9db6d71..a794a22 100755 (executable)
--- a/mach/z80/libbc/compmodule
+++ b/mach/z80/libbc/compmodule
@@ -1,4 +1,4 @@
-if ${MACH?ack} -I../../../h ${MACHFL?} $1 1>&2
-then echo `basename $1 $2`.s
-else rm -f `basename $1 $2`.s
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then echo `basename $1 $2`.o
+else exit 1
 fi

diff --git a/mach/z80/libcc/Makefile b/mach/z80/libcc/Makefile
index acc68c1..10b6fea 100644 (file)
--- a/mach/z80/libcc/Makefile
+++ b/mach/z80/libcc/Makefile
@@ -1,5 +1,6 @@
+SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=z80" "SUF=s"
+MACHDEF="MACH=z80" "SUF=$(SUF)" "ASAR=aal"
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 MON="PREF=mon" "SRC=lang/cem/libcc/mon"

diff --git a/mach/z80/libcc/compmodule b/mach/z80/libcc/compmodule
index 9db6d71..a794a22 100755 (executable)
--- a/mach/z80/libcc/compmodule
+++ b/mach/z80/libcc/compmodule
@@ -1,4 +1,4 @@
-if ${MACH?ack} -I../../../h ${MACHFL?} $1 1>&2
-then echo `basename $1 $2`.s
-else rm -f `basename $1 $2`.s
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then echo `basename $1 $2`.o
+else exit 1
 fi

diff --git a/mach/z80/libpc/Makefile b/mach/z80/libpc/Makefile
index 5128fce..d56deb5 100644 (file)
--- a/mach/z80/libpc/Makefile
+++ b/mach/z80/libpc/Makefile
@@ -1,5 +1,6 @@
+SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=z80" "SUF=s"
+MACHDEF="MACH=z80" "SUF=$(SUF)" "ASAR=aal"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
 
 install:

diff --git a/mach/z80/libpc/compmodule b/mach/z80/libpc/compmodule
index 9db6d71..a794a22 100755 (executable)
--- a/mach/z80/libpc/compmodule
+++ b/mach/z80/libpc/compmodule
@@ -1,4 +1,4 @@
-if ${MACH?ack} -I../../../h ${MACHFL?} $1 1>&2
-then echo `basename $1 $2`.s
-else rm -f `basename $1 $2`.s
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then echo `basename $1 $2`.o
+else exit 1
 fi