adapted to get .o files

diff --git a/mach/i86/libbc/Makefile b/mach/i86/libbc/Makefile
index 6917949..0b1a1cb 100644 (file)
--- a/mach/i86/libbc/Makefile
+++ b/mach/i86/libbc/Makefile
@@ -1,5 +1,5 @@
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=i86" "SUF=s"
+MACHDEF="MACH=i86" "SUF=o" "ASAR=aal"
 BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib"
 
 install:
@@ -11,7 +11,7 @@ cmp:
        -../../compare tail_bc
 
 clean:
-               -rm -f *.old *.[ce$(SUF)] tail* head*
+       -rm -f *.old *.[ce$(SUF)] tail* head*
 
 opr:
        make pr | opr

diff --git a/mach/i86/libbc/compmodule b/mach/i86/libbc/compmodule
index 2bcf66c..6327cb9 100755 (executable)
--- a/mach/i86/libbc/compmodule
+++ b/mach/i86/libbc/compmodule
@@ -1,2 +1,6 @@
-${MACH?ack} -I../../../h ${MACHFL?} $1 1>&2
-echo `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/i86/libpc/Makefile b/mach/i86/libpc/Makefile
index 5c669cf..546722a 100644 (file)
--- a/mach/i86/libpc/Makefile
+++ b/mach/i86/libpc/Makefile
@@ -1,5 +1,5 @@
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=i86" "SUF=s"
+MACHDEF="MACH=i86" "SUF=o" "ASAR=aal"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
 
 install:
@@ -11,7 +11,7 @@ cmp:
        -../../compare tail_pc
 
 clean:
-               -rm -f *.old *.[ce$(SUF)] tail* head*
+       -rm -f *.old *.[ce$(SUF)] tail* head*
 
 opr:
        make pr | opr

diff --git a/mach/i86/libpc/compmodule b/mach/i86/libpc/compmodule
index 2bcf66c..6327cb9 100755 (executable)
--- a/mach/i86/libpc/compmodule
+++ b/mach/i86/libpc/compmodule
@@ -1,2 +1,6 @@
-${MACH?ack} -I../../../h ${MACHFL?} $1 1>&2
-echo `basename $1 $2`.s
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then
+       echo `basename $1 $2`.o
+else
+       exit 1
+fi