Adapted for use of ACK VAX assembler

diff --git a/mach/vax4/libm2/Makefile b/mach/vax4/libm2/Makefile
index 3024ca6..d5e810f 100644 (file)
--- a/mach/vax4/libm2/Makefile
+++ b/mach/vax4/libm2/Makefile
@@ -1,24 +1,21 @@
 SUF=o
 EMHOME=../../..
 MAKEFILE=$(EMHOME)/mach/proto/libg/Makefile
-MACHDEF="MACH=vax4" "SUF=$(SUF)" "ASAR=ar"
+MACHDEF="MACH=vax4" "SUF=$(SUF)" "ASAR=aal"
 M2LIB = lang/m2/libm2
 MOD="PREF=m2" "SUB=" "SRC=$(M2LIB)"
 
 all:
-               RANLIB=ranlib ; export RANLIB ; \
                make -f $(MAKEFILE) $(MOD) $(MACHDEF) all
 
 install:       cpmod
 
 cpmod:
-               RANLIB=ranlib ; export RANLIB ; \
                make -f $(MAKEFILE) $(MOD) $(MACHDEF) cp
 
 cmp:           cmpmod
 
 cmpmod:
-               RANLIB=ranlib ; export RANLIB ; \
                make -f $(MAKEFILE) $(MOD) $(MACHDEF) all
                -$(EMHOME)/mach/compare tail_m2
                -$(EMHOME)/mach/compare head_m2

diff --git a/mach/vax4/liboc/Makefile b/mach/vax4/liboc/Makefile
index 3bed223..8193808 100644 (file)
--- a/mach/vax4/liboc/Makefile
+++ b/mach/vax4/liboc/Makefile
@@ -1,10 +1,9 @@
 SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=vax4" "SUF=$(SUF)" "ASAR=ar"
+MACHDEF="MACH=vax4" "SUF=$(SUF)" "ASAR=aal"
 PCDEF="PREF=ocm" "SUB=" "SRC=lang/occam/lib"
 
 install:
-       RANLIB=ranlib ; export RANLIB ;\
        make -f $(MAKEFILE) $(PCDEF) $(MACHDEF) tailcp
 
 cmp:

diff --git a/mach/vax4/libpc/Makefile b/mach/vax4/libpc/Makefile
index cb4a8c7..e8b43d4 100644 (file)
--- a/mach/vax4/libpc/Makefile
+++ b/mach/vax4/libpc/Makefile
@@ -1,18 +1,15 @@
 SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=vax4" "SUF=$(SUF)" "ASAR=ar"
+MACHDEF="MACH=vax4" "SUF=$(SUF)" "ASAR=aal"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
 
 all:
-       RANLIB=ranlib ; export RANLIB ;\
        make -f $(MAKEFILE) $(PCDEF) $(MACHDEF) all
 
 install:
-       RANLIB=ranlib ; export RANLIB ;\
        make -f $(MAKEFILE) $(PCDEF) $(MACHDEF) cp
 
 cmp:
-       RANLIB=ranlib ; export RANLIB ;\
        make -f $(MAKEFILE) $(PCDEF) $(MACHDEF) all
        -../../compare head_pc
        -../../compare tail_pc