From f88e8c3ba46502c15db86c9e96b2e9dc7f187de0 Mon Sep 17 00:00:00 2001 From: ceriel Date: Fri, 30 Jan 1987 20:06:04 +0000 Subject: [PATCH] --- mach/em22/libcc/Makefile | 7 ++++--- mach/em22/libcc/compmodule | 6 ++++-- mach/em24/libbc/Makefile | 3 ++- mach/em24/libbc/compmodule | 6 ++++-- mach/em24/libcc/Makefile | 19 ++++++++++--------- mach/em24/libcc/compmodule | 6 ++++-- mach/em24/libpc/Makefile | 3 ++- mach/em24/libpc/compmodule | 6 ++++-- mach/em44/libbc/Makefile | 3 ++- mach/em44/libbc/compmodule | 6 ++++-- mach/em44/libcc/Makefile | 19 ++++++++++--------- mach/em44/libcc/compmodule | 6 ++++-- mach/em44/libpc/Makefile | 3 ++- mach/em44/libpc/compmodule | 6 ++++-- 14 files changed, 60 insertions(+), 39 deletions(-) diff --git a/mach/em22/libcc/Makefile b/mach/em22/libcc/Makefile index 8c5babec4..4f231a862 100644 --- a/mach/em22/libcc/Makefile +++ b/mach/em22/libcc/Makefile @@ -1,12 +1,13 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int" "SUF=m" +MACHDEF="MACH=int" "SUF=$(SUF)" 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" LIBM="PREF=m" "SRC=lang/cem/libcc/libm" LIBLN="PREF=ln" "SRC=lang/cem/libcc/libln" -install: cpstdio cpgen cpmon cplibm cplibln +install: cpstdio cpgen cpmon cpstdio: make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp @@ -19,7 +20,7 @@ cplibm: cplibln: make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tailcp -cmp: cmpstdio cmpgen cmpmon cmplibm cmplibln +cmp: cmpstdio cmpgen cmpmon cmpstdio: make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail diff --git a/mach/em22/libcc/compmodule b/mach/em22/libcc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em22/libcc/compmodule +++ b/mach/em22/libcc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi diff --git a/mach/em24/libbc/Makefile b/mach/em24/libbc/Makefile index 49e3164df..3b9dc3aa8 100644 --- a/mach/em24/libbc/Makefile +++ b/mach/em24/libbc/Makefile @@ -1,5 +1,6 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int24" "SUF=m" +MACHDEF="MACH=int22" "SUF=$(SUF)" BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib" install: diff --git a/mach/em24/libbc/compmodule b/mach/em24/libbc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em24/libbc/compmodule +++ b/mach/em24/libbc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi diff --git a/mach/em24/libcc/Makefile b/mach/em24/libcc/Makefile index 971906ef6..4f231a862 100644 --- a/mach/em24/libcc/Makefile +++ b/mach/em24/libcc/Makefile @@ -1,12 +1,13 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int24" "SUF=m" +MACHDEF="MACH=int" "SUF=$(SUF)" 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" LIBM="PREF=m" "SRC=lang/cem/libcc/libm" LIBLN="PREF=ln" "SRC=lang/cem/libcc/libln" -install: cpstdio cpgen cpmon cplibm cplibln +install: cpstdio cpgen cpmon cpstdio: make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp @@ -19,25 +20,25 @@ cplibm: cplibln: make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tailcp -cmp: cmpstdio cmpgen cmpmon cmplibm cmplibln +cmp: cmpstdio cmpgen cmpmon cmpstdio: make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail - -../../compare tail_cc.1s + -../../compare tail_cc.1s cmpgen: make -f $(MAKEFILE) $(GEN) $(MACHDEF) head - -../../compare head_cc + -../../compare head_cc make -f $(MAKEFILE) $(GEN) $(MACHDEF) tail - -../../compare tail_cc.2g + -../../compare tail_cc.2g cmpmon: make -f $(MAKEFILE) $(MON) $(MACHDEF) tail - -../../compare tail_mon + -../../compare tail_mon cmplibm: make -f $(MAKEFILE) $(LIBM) $(MACHDEF) tail - -../../compare tail_m + -../../compare tail_m cmplibln: make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tail - -../../compare tail_ln + -../../compare tail_ln clean: -rm -f *.old *.[ce$(SUF)] tail* head* diff --git a/mach/em24/libcc/compmodule b/mach/em24/libcc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em24/libcc/compmodule +++ b/mach/em24/libcc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi diff --git a/mach/em24/libpc/Makefile b/mach/em24/libpc/Makefile index 797709266..9258cacd7 100644 --- a/mach/em24/libpc/Makefile +++ b/mach/em24/libpc/Makefile @@ -1,5 +1,6 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int24" "SUF=m" +MACHDEF="MACH=int" "SUF=$(SUF)" PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc" install: diff --git a/mach/em24/libpc/compmodule b/mach/em24/libpc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em24/libpc/compmodule +++ b/mach/em24/libpc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi diff --git a/mach/em44/libbc/Makefile b/mach/em44/libbc/Makefile index 4dc2b3ac6..3b9dc3aa8 100644 --- a/mach/em44/libbc/Makefile +++ b/mach/em44/libbc/Makefile @@ -1,5 +1,6 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int44" "SUF=m" +MACHDEF="MACH=int22" "SUF=$(SUF)" BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib" install: diff --git a/mach/em44/libbc/compmodule b/mach/em44/libbc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em44/libbc/compmodule +++ b/mach/em44/libbc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi diff --git a/mach/em44/libcc/Makefile b/mach/em44/libcc/Makefile index 9f0eb0f05..4f231a862 100644 --- a/mach/em44/libcc/Makefile +++ b/mach/em44/libcc/Makefile @@ -1,12 +1,13 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int44" "SUF=m" +MACHDEF="MACH=int" "SUF=$(SUF)" 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" LIBM="PREF=m" "SRC=lang/cem/libcc/libm" LIBLN="PREF=ln" "SRC=lang/cem/libcc/libln" -install: cpstdio cpgen cpmon cplibm cplibln cpmon +install: cpstdio cpgen cpmon cpstdio: make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp @@ -19,25 +20,25 @@ cplibm: cplibln: make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tailcp -cmp: cmpstdio cmpgen cmpmon cmplibm cmplibln +cmp: cmpstdio cmpgen cmpmon cmpstdio: make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail - -../../compare tail_cc.1s + -../../compare tail_cc.1s cmpgen: make -f $(MAKEFILE) $(GEN) $(MACHDEF) head - -../../compare head_cc + -../../compare head_cc make -f $(MAKEFILE) $(GEN) $(MACHDEF) tail - -../../compare tail_cc.2g + -../../compare tail_cc.2g cmpmon: make -f $(MAKEFILE) $(MON) $(MACHDEF) tail - -../../compare tail_mon + -../../compare tail_mon cmplibm: make -f $(MAKEFILE) $(LIBM) $(MACHDEF) tail - -../../compare tail_m + -../../compare tail_m cmplibln: make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tail - -../../compare tail_ln + -../../compare tail_ln clean: -rm -f *.old *.[ce$(SUF)] tail* head* diff --git a/mach/em44/libcc/compmodule b/mach/em44/libcc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em44/libcc/compmodule +++ b/mach/em44/libcc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi diff --git a/mach/em44/libpc/Makefile b/mach/em44/libpc/Makefile index e9ad8f686..9258cacd7 100644 --- a/mach/em44/libpc/Makefile +++ b/mach/em44/libpc/Makefile @@ -1,5 +1,6 @@ +SUF=m MAKEFILE=../../proto/libg/Makefile -MACHDEF="MACH=int44" "SUF=m" +MACHDEF="MACH=int" "SUF=$(SUF)" PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc" install: diff --git a/mach/em44/libpc/compmodule b/mach/em44/libpc/compmodule index 330b4aef5..1c3c2ecfb 100755 --- a/mach/em44/libpc/compmodule +++ b/mach/em44/libpc/compmodule @@ -1,2 +1,4 @@ -${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 -echo `basename $1 $2`.m +if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2 +then echo `basename $1 $2`.m +else exit 1 +fi -- 2.34.1