1 - Added Basic library.

2 - Added revision number.

diff --git a/lib/descr/cpm b/lib/descr/cpm
index afa4cc9..9575b32 100644 (file)
--- a/lib/descr/cpm
+++ b/lib/descr/cpm
@@ -1,3 +1,4 @@
+# $Revision$
 var w=2
 var p=2
 var s=2
@@ -6,20 +7,23 @@ var f=4
 var d=4
 var M=cpm
 var NAME=CPM
-var LIB=mach/z80/int/lib/tail_
-var RT=mach/z80/int/lib/head_
+var LIB=lib/z80/int/tail_
+var RT=lib/z80/int/head_
 var SIZE_F=-sm
 var INCLUDES=-I{EM}/include -I/usr/include
 name asld
-       from .k.m.a
-       to e.out
+       from .k.m.a.g
+       to .out
+       outfile e.out
        program {EM}/lib/em_ass
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -+* ASS_F={ASS_F?} -+*
        mapflag --* ASS_F={ASS_F?} --*
        mapflag -s* SIZE_F=-s*
-       args {ASS_F?} ({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.c.p:{TAIL}={EM}/{LIB}mon)
-       prop C
+       args {ASS_F?} ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon)
+       linker
 end

diff --git a/lib/descr/ibm.nosid b/lib/descr/ibm.nosid
index 98f2eab..d334f57 100644 (file)
--- a/lib/descr/ibm.nosid
+++ b/lib/descr/ibm.nosid
@@ -1,3 +1,4 @@
+# $Revision$
 var w=2
 var p=2
 var s=2
@@ -28,10 +29,12 @@ name asld
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RTIBM}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.e:{TAIL}={EM}/{LIBIBM}em) \
-(.c.p:{TAIL}={EM}/{LIBIBM}mon) \
-(.e:{TAIL}={EM}/{LIBIBM}em.vend)
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.e:{TAIL}={EM}/{LIBIBM}em) \
+               (.b.c.p:{TAIL}={EM}/{LIBIBM}mon) \
+               (.e:{TAIL}={EM}/{LIBIBM}em.vend)
        linker
 end

diff --git a/lib/descr/m68k2.macs b/lib/descr/m68k2.macs
index 58bdc46..203e7e3 100644 (file)
--- a/lib/descr/m68k2.macs
+++ b/lib/descr/m68k2.macs
@@ -1,3 +1,4 @@
+# $Revision$
 var w=2
 var p=4
 var s=2
@@ -6,29 +7,33 @@ var f=4
 var d=8
 var NAME=m68k2
 var M=m68k2
-var LIBDIR=mach/m68k2/lib
-var LIB=mach/m68k2/lib/tail_
-var RT=mach/m68k2/lib/head_
+var LIBDIR=/lib/{M}
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p.c:{TAIL}={EM}/{LIBDIR}/sys1.s) (.p:{TAIL}={EM}/{LIBDIR}/sys2.s) \
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+(.p.c.b:{TAIL}={EM}/{LIBDIR}/sys1.s) (.p:{TAIL}={EM}/{LIBDIR}/sys2.s) \
 (.c:{TAIL}={EM}/{LIBDIR}/write.s) \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.c:{TAIL}={EM}/{LIB}mon {EM}/{LIB}fake) \
+(.p:{TAIL}={EM}/{LIB}pc) \
+(.b:{TAIL}={EM}/{LIB}bc) \
+(.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+(.b.c:{TAIL}={EM}/{LIB}mon {EM}/{LIB}fake) \
 (.e:{TAIL}={EM}/{LIB}em.rt {EM}/{LIB}em.vend)
-       prop Cm
+       prep cond
+       linker
 end

diff --git a/lib/descr/nascom b/lib/descr/nascom
index 117911d..db67d20 100644 (file)
--- a/lib/descr/nascom
+++ b/lib/descr/nascom
@@ -1,3 +1,4 @@
+# $Revision$
 var w=1
 var p=2
 var s=1
@@ -6,23 +7,24 @@ var f=4
 var d=8
 var NAME=nascom
 var M=z80a
-var LIB=mach/z80a/lib/tail_
-var RT=mach/z80a/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_be
+       program {EM}/lib/{M}/be
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/z80/as
        mapflag -l* LNAME={EM}/{LIB}*
-       args (.e:{HEAD}={EM}/{RT}em) ({RTS}:.c={EM}/{RT}cc) -o > \
+       args (.e:{HEAD}={EM}/{RT}em) ({RTS}:.b.c={EM}/{RT}cc) -o > \
 (.e:{TAIL}={EM}/{LIB}em.1 {EM}/{LIB}em.2)
-       prop C
+       linker
 end