diff -u -r /home/andreas/distro/gd/src/common/coll-ext/CollExt.lid ./common/coll-ext/CollExt.lid
--- /home/andreas/distro/gd/src/common/coll-ext/CollExt.lid	Fri Jul 30 17:25:12 1999
+++ ./common/coll-ext/CollExt.lid	Wed Dec 30 19:18:31 1998
@@ -1,6 +1,7 @@
-rcs-header: $Header: /home/cvsroot/gd/src/common/coll-ext/CollExt.lid,v 1.3 1999/07/30 17:25:12 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/common/coll-ext/CollExt.lid,v 1.2 1998/12/30 19:18:31 tc Exp $
 library: collection-extensions
 unique-id-base: 400
+unit-prefix: collext
 
 library.dylan
 solist.dylan
diff -u -r /home/andreas/distro/gd/src/common/common-dylan/common-dylan.lid ./common/common-dylan/common-dylan.lid
--- /home/andreas/distro/gd/src/common/common-dylan/common-dylan.lid	Fri Jul 30 17:25:13 1999
+++ ./common/common-dylan/common-dylan.lid	Sat Mar 20 15:09:45 1999
@@ -1,4 +1,5 @@
 library: common-dylan
 unique-id-base: 5200
+unit-prefix: commondyl
 
 common-dylan-exports.dylan
diff -u -r /home/andreas/distro/gd/src/common/common-dylan/common-extensions.lid ./common/common-dylan/common-extensions.lid
--- /home/andreas/distro/gd/src/common/common-dylan/common-extensions.lid	Fri Jul 30 17:25:13 1999
+++ ./common/common-dylan/common-extensions.lid	Tue Apr 13 05:12:40 1999
@@ -1,5 +1,6 @@
 library: common-extensions
 unique-id-base: 5100
+unit-prefix: commonext
 
 common-extensions-exports.dylan
 c-support.dylan
diff -u -r /home/andreas/distro/gd/src/common/file-system/file-system.lid ./common/file-system/file-system.lid
--- /home/andreas/distro/gd/src/common/file-system/file-system.lid	Thu Aug 12 11:41:30 1999
+++ ./common/file-system/file-system.lid	Tue Jun  8 21:39:58 1999
@@ -1,4 +1,5 @@
 Library:     file-system
+Unit-prefix: fileSystem
 unique-id-base: 1800
 
 file-system-exports.dylan
diff -u -r /home/andreas/distro/gd/src/common/format-out/FormatOut.lid ./common/format-out/FormatOut.lid
--- /home/andreas/distro/gd/src/common/format-out/FormatOut.lid	Fri Jul 30 17:25:14 1999
+++ ./common/format-out/FormatOut.lid	Sun May  3 19:55:01 1998
@@ -1,5 +1,6 @@
 library: Format-Out
 unique-id-base: 1050
+unit-prefix: formatout
 
 library.dylan
 format-out.dylan
diff -u -r /home/andreas/distro/gd/src/common/getopt/getopt.lid ./common/getopt/getopt.lid
--- /home/andreas/distro/gd/src/common/getopt/getopt.lid	Fri Jul 30 17:25:14 1999
+++ ./common/getopt/getopt.lid	Wed Jul  7 18:40:52 1999
@@ -1,5 +1,6 @@
 library: parse-arguments
 unique-id-base: 1500
+unit-prefix: getopt
 
 getopt-exports.dylan
 getopt.dylan
diff -u -r /home/andreas/distro/gd/src/common/matrix/Matrix.lid ./common/matrix/Matrix.lid
--- /home/andreas/distro/gd/src/common/matrix/Matrix.lid	Fri Jul 30 17:25:15 1999
+++ ./common/matrix/Matrix.lid	Sun May  3 19:55:01 1998
@@ -1,5 +1,6 @@
 library: Matrix
 unique-id-base: 1100
+unit-prefix: matrix
 
 library.dylan
 matrix.dylan
diff -u -r /home/andreas/distro/gd/src/common/regexp/RegExp.lid ./common/regexp/RegExp.lid
--- /home/andreas/distro/gd/src/common/regexp/RegExp.lid	Fri Jul 30 17:25:15 1999
+++ ./common/regexp/RegExp.lid	Sun May  3 19:55:02 1998
@@ -1,6 +1,7 @@
-rcs-header: $Header: /home/cvsroot/gd/src/common/regexp/RegExp.lid,v 1.2 1999/07/30 17:25:15 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/common/regexp/RegExp.lid,v 1.1.1.1 1998/05/03 19:55:02 andreas Exp $
 library: Regular-expressions
 unique-id-base: 1400
+unit-prefix: regexp
 
 library.dylan
 match.dylan
diff -u -r /home/andreas/distro/gd/src/common/standard-io/standard-io.lid ./common/standard-io/standard-io.lid
--- /home/andreas/distro/gd/src/common/standard-io/standard-io.lid	Fri Jul 30 17:25:15 1999
+++ ./common/standard-io/standard-io.lid	Tue Jun  8 21:24:10 1999
@@ -1,5 +1,6 @@
 library: standard-io
 unique-id-base: 1700
+unit-prefix: stdio
 
 library.dylan
 standard-io.dylan
diff -u -r /home/andreas/distro/gd/src/common/stream-ext/StreamExt.lid ./common/stream-ext/StreamExt.lid
--- /home/andreas/distro/gd/src/common/stream-ext/StreamExt.lid	Fri Jul 30 17:25:15 1999
+++ ./common/stream-ext/StreamExt.lid	Sun May  3 19:55:03 1998
@@ -1,6 +1,7 @@
-rcs-header: $Header: /home/cvsroot/gd/src/common/stream-ext/StreamExt.lid,v 1.2 1999/07/30 17:25:15 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/common/stream-ext/StreamExt.lid,v 1.1.1.1 1998/05/03 19:55:03 andreas Exp $
 library: Stream-extensions
 unique-id-base: 1030
+unit-prefix: streamext
 
 library.dylan
 stream-extensions.dylan
diff -u -r /home/andreas/distro/gd/src/common/streams/unix-streams.lid ./common/streams/unix-streams.lid
--- /home/andreas/distro/gd/src/common/streams/unix-streams.lid	Fri Jul 30 17:25:16 1999
+++ ./common/streams/unix-streams.lid	Tue Jun  8 21:18:53 1999
@@ -1,5 +1,6 @@
 Library: Streams
 unique-id-base: 1600
+unit-prefix: streams
 
 library.dylan
 fake-threads.dylan
diff -u -r /home/andreas/distro/gd/src/common/streams/win32-gcc-streams.lid ./common/streams/win32-gcc-streams.lid
--- /home/andreas/distro/gd/src/common/streams/win32-gcc-streams.lid	Fri Jul 30 17:25:16 1999
+++ ./common/streams/win32-gcc-streams.lid	Tue Jun  8 21:18:53 1999
@@ -1,5 +1,6 @@
 Library: Streams
 unique-id-base: 1600
+unit-prefix: streams
 
 library.dylan
 fake-threads.dylan
diff -u -r /home/andreas/distro/gd/src/common/streams/win32-streams.lid ./common/streams/win32-streams.lid
--- /home/andreas/distro/gd/src/common/streams/win32-streams.lid	Fri Jul 30 17:25:16 1999
+++ ./common/streams/win32-streams.lid	Tue Jun  8 21:18:53 1999
@@ -1,5 +1,6 @@
 Library: Streams
 unique-id-base: 1600
+unit-prefix: streams
 linker-options: /defaultlib:wsock32
 
 library.dylan
diff -u -r /home/andreas/distro/gd/src/common/string-ext/StringExt.lid ./common/string-ext/StringExt.lid
--- /home/andreas/distro/gd/src/common/string-ext/StringExt.lid	Fri Jul 30 17:25:17 1999
+++ ./common/string-ext/StringExt.lid	Sun May  3 19:55:04 1998
@@ -1,6 +1,7 @@
-rcs-header: $Header: /home/cvsroot/gd/src/common/string-ext/StringExt.lid,v 1.2 1999/07/30 17:25:17 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/common/string-ext/StringExt.lid,v 1.1.1.1 1998/05/03 19:55:04 andreas Exp $
 library: String-extensions
 unique-id-base: 654
+unit-prefix: stringext
 
 library.dylan
 character-type.dylan
diff -u -r /home/andreas/distro/gd/src/common/system/posix-system.lid ./common/system/posix-system.lid
--- /home/andreas/distro/gd/src/common/system/posix-system.lid	Thu Aug 12 11:41:30 1999
+++ ./common/system/posix-system.lid	Tue Apr 20 07:32:37 1999
@@ -1,4 +1,5 @@
 Library: system
+Unit-prefix: system
 
 system-exports.dylan
 os-constants.dylan
diff -u -r /home/andreas/distro/gd/src/common/table-ext/TableExt.lid ./common/table-ext/TableExt.lid
--- /home/andreas/distro/gd/src/common/table-ext/TableExt.lid	Fri Jul 30 17:25:17 1999
+++ ./common/table-ext/TableExt.lid	Sun May  3 19:55:05 1998
@@ -1,5 +1,6 @@
 library: Table-Extensions
 unique-id-base: 1000
+unit-prefix: tableext
 
 library.dylan
 table-ext.dylan
diff -u -r /home/andreas/distro/gd/src/common/time/Time.lid ./common/time/Time.lid
--- /home/andreas/distro/gd/src/common/time/Time.lid	Fri Jul 30 17:25:17 1999
+++ ./common/time/Time.lid	Sun May  3 19:55:05 1998
@@ -1,5 +1,6 @@
 library: Time
 unique-id-base: 1200
+unit-prefix: time
 
 library.dylan
 time-intr.dylan
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/base/Base.lid ./d2c/compiler/base/Base.lid
--- /home/andreas/distro/gd/src/d2c/compiler/base/Base.lid	Fri Jul 30 17:25:17 1999
+++ ./d2c/compiler/base/Base.lid	Fri Jul 16 16:30:46 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/base/Base.lid,v 1.3 1999/07/30 17:25:17 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/base/Base.lid,v 1.2 1999/07/16 16:30:46 housel Exp $
 library: compiler-base
+unit-prefix: base
 unique-id-base: 10000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/cback/Cback.lid ./d2c/compiler/cback/Cback.lid
--- /home/andreas/distro/gd/src/d2c/compiler/cback/Cback.lid	Fri Jul 30 17:25:17 1999
+++ ./d2c/compiler/cback/Cback.lid	Fri Jul 16 16:30:46 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/cback/Cback.lid,v 1.3 1999/07/30 17:25:17 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/cback/Cback.lid,v 1.2 1999/07/16 16:30:46 housel Exp $
 library: compiler-cback
+unit-prefix: cback
 unique-id-base: 10750
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/convert/Convert.lid ./d2c/compiler/convert/Convert.lid
--- /home/andreas/distro/gd/src/d2c/compiler/convert/Convert.lid	Fri Jul 30 17:25:17 1999
+++ ./d2c/compiler/convert/Convert.lid	Fri Jul 16 16:30:49 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/convert/Convert.lid,v 1.3 1999/07/30 17:25:17 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/convert/Convert.lid,v 1.2 1999/07/16 16:30:49 housel Exp $
 library: compiler-convert
+unit-prefix: convert
 unique-id-base: 11000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/front/Front.lid ./d2c/compiler/front/Front.lid
--- /home/andreas/distro/gd/src/d2c/compiler/front/Front.lid	Fri Jul 30 17:25:17 1999
+++ ./d2c/compiler/front/Front.lid	Fri Jul 16 16:30:49 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/front/Front.lid,v 1.3 1999/07/30 17:25:17 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/front/Front.lid,v 1.2 1999/07/16 16:30:49 housel Exp $
 library: compiler-front
+unit-prefix: front
 unique-id-base: 10250
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/main/Main.lid ./d2c/compiler/main/Main.lid
--- /home/andreas/distro/gd/src/d2c/compiler/main/Main.lid	Fri Jul 30 17:24:32 1999
+++ ./d2c/compiler/main/Main.lid	Fri Apr  9 23:06:49 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/main/Main.lid,v 1.3 1999/07/30 17:24:32 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/main/Main.lid,v 1.2 1999/04/09 23:06:49 andreas Exp $
 library: compiler-main
+unit-prefix: main
 unique-id-base: 12000
 executable: d2c
 entry-point: main:%main
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/optimize/Optimize.lid ./d2c/compiler/optimize/Optimize.lid
--- /home/andreas/distro/gd/src/d2c/compiler/optimize/Optimize.lid	Fri Jul 30 17:25:19 1999
+++ ./d2c/compiler/optimize/Optimize.lid	Fri Jul 16 16:30:50 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/optimize/Optimize.lid,v 1.3 1999/07/30 17:25:19 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/optimize/Optimize.lid,v 1.2 1999/07/16 16:30:50 housel Exp $
 library: compiler-optimize
+unit-prefix: optimize
 unique-id-base: 11250
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/d2c/compiler/parser/Parser.lid ./d2c/compiler/parser/Parser.lid
--- /home/andreas/distro/gd/src/d2c/compiler/parser/Parser.lid	Fri Jul 30 17:25:19 1999
+++ ./d2c/compiler/parser/Parser.lid	Fri Jul 16 16:30:50 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/parser/Parser.lid,v 1.3 1999/07/30 17:25:19 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/compiler/parser/Parser.lid,v 1.2 1999/07/16 16:30:50 housel Exp $
 library: compiler-parser
+unit-prefix: parser
 unique-id-base: 10500
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/d2c/dig/hp-dig.lid ./d2c/dig/hp-dig.lid
--- /home/andreas/distro/gd/src/d2c/dig/hp-dig.lid	Fri Jul 30 17:25:19 1999
+++ ./d2c/dig/hp-dig.lid	Sun May  3 19:55:51 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/dig/hp-dig.lid,v 1.2 1999/07/30 17:25:19 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/dig/hp-dig.lid,v 1.1.1.1 1998/05/03 19:55:51 andreas Exp $
 library: d2c-gnu
+unit-prefix: dig
 unique-id-base: 5000
 executable: dig
 entry-point: d2c-gnu:%main
diff -u -r /home/andreas/distro/gd/src/d2c/dig/posix-dig.lid ./d2c/dig/posix-dig.lid
--- /home/andreas/distro/gd/src/d2c/dig/posix-dig.lid	Fri Jul 30 17:25:19 1999
+++ ./d2c/dig/posix-dig.lid	Sat Apr 10 06:44:19 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/dig/posix-dig.lid,v 1.2 1999/07/30 17:25:19 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/dig/posix-dig.lid,v 1.1 1999/04/10 06:44:19 emk Exp $
 library: d2c-gnu
+unit-prefix: dig
 unique-id-base: 5000
 executable: dig
 entry-point: d2c-gnu:%main
diff -u -r /home/andreas/distro/gd/src/d2c/dig/win32-dig.lid ./d2c/dig/win32-dig.lid
--- /home/andreas/distro/gd/src/d2c/dig/win32-dig.lid	Fri Jul 30 17:25:19 1999
+++ ./d2c/dig/win32-dig.lid	Sun May  3 19:55:52 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/d2c/dig/win32-dig.lid,v 1.2 1999/07/30 17:25:19 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/d2c/dig/win32-dig.lid,v 1.1.1.1 1998/05/03 19:55:52 andreas Exp $
 library: d2c-gnu
+unit-prefix: dig
 unique-id-base: 5000
 executable: dig
 entry-point: d2c-gnu:%main
diff -u -r /home/andreas/distro/gd/src/d2c/runtime/garbage-collection/garbage-collection.lid ./d2c/runtime/garbage-collection/garbage-collection.lid
--- /home/andreas/distro/gd/src/d2c/runtime/garbage-collection/garbage-collection.lid	Fri Jul 30 17:25:19 1999
+++ ./d2c/runtime/garbage-collection/garbage-collection.lid	Wed Jun  9 14:02:31 1999
@@ -1,5 +1,6 @@
 library: garbage-collection
 unique-id-base: 2100
+unit-prefix: garbagecollection
 
 garbage-collection-exports.dylan
 garbage-collection.dylan
diff -u -r /home/andreas/distro/gd/src/d2c/runtime/melange/melange.lid ./d2c/runtime/melange/melange.lid
--- /home/andreas/distro/gd/src/d2c/runtime/melange/melange.lid	Fri Jul 30 17:25:20 1999
+++ ./d2c/runtime/melange/melange.lid	Sun May  3 19:55:51 1998
@@ -1,5 +1,6 @@
 library: melange-support
 unique-id-base: 7000
+unit-prefix: melange
 
 exports.dylan
 melange.dylan
diff -u -r /home/andreas/distro/gd/src/demos/hello-world/hello-world.lid ./demos/hello-world/hello-world.lid
--- /home/andreas/distro/gd/src/demos/hello-world/hello-world.lid	Fri Jul 30 17:25:20 1999
+++ ./demos/hello-world/hello-world.lid	Sun May  3 19:55:59 1998
@@ -1,6 +1,7 @@
-rcs-header: $Header: /home/cvsroot/gd/src/demos/hello-world/hello-world.lid,v 1.2 1999/07/30 17:25:20 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/demos/hello-world/hello-world.lid,v 1.1.1.1 1998/05/03 19:55:59 andreas Exp $
 library: hello-world
 executable: hello-world
+unit-prefix: hw
 entry-point: hello-world:%main
 
 hello-world-exports.dylan
diff -u -r /home/andreas/distro/gd/src/demos/library-demo/library-demo.lid ./demos/library-demo/library-demo.lid
--- /home/andreas/distro/gd/src/demos/library-demo/library-demo.lid	Fri Jul 30 17:25:20 1999
+++ ./demos/library-demo/library-demo.lid	Sun May  3 19:56:01 1998
@@ -1,5 +1,6 @@
 library: library-demo
 executable: library-demo
+unit-prefix: libdemo
 
 library-demo-exports.dylan
 library-demo.dylan
diff -u -r /home/andreas/distro/gd/src/demos/minesweeper/minesweeper.lid ./demos/minesweeper/minesweeper.lid
--- /home/andreas/distro/gd/src/demos/minesweeper/minesweeper.lid	Fri Jul 30 17:25:22 1999
+++ ./demos/minesweeper/minesweeper.lid	Sun May  3 19:56:00 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/demos/minesweeper/minesweeper.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/demos/minesweeper/minesweeper.lid,v 1.1.1.1 1998/05/03 19:56:00 andreas Exp $
 library: mine-sweeper
+unit-prefix: minesweeper
 executable: minesweeper
 
 minesweeper-exports.dylan
diff -u -r /home/andreas/distro/gd/src/demos/stream-demo/stream-demo.lid ./demos/stream-demo/stream-demo.lid
--- /home/andreas/distro/gd/src/demos/stream-demo/stream-demo.lid	Fri Jul 30 17:25:22 1999
+++ ./demos/stream-demo/stream-demo.lid	Sun May  3 19:56:02 1998
@@ -1,5 +1,6 @@
 library: stream-demo
 executable: stream-demo
+unit-prefix: streamdemo
 entry-point: stream-demo:%main
 
 stream-demo-exports.dylan
diff -u -r /home/andreas/distro/gd/src/demos/tk-html2txt/html2txt.lid ./demos/tk-html2txt/html2txt.lid
--- /home/andreas/distro/gd/src/demos/tk-html2txt/html2txt.lid	Fri Jul 30 17:25:22 1999
+++ ./demos/tk-html2txt/html2txt.lid	Sun May  3 19:56:01 1998
@@ -1,6 +1,7 @@
-rcs-header: $Header: /home/cvsroot/gd/src/demos/tk-html2txt/html2txt.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/demos/tk-html2txt/html2txt.lid,v 1.1.1.1 1998/05/03 19:56:01 andreas Exp $
 library: html
 executable: tk-html2txt
+unit-prefix: tkhtml
 
 html2txt-exports.dylan
 html2txt.dylan
diff -u -r /home/andreas/distro/gd/src/tests/coll-ext-test.lid ./tests/coll-ext-test.lid
--- /home/andreas/distro/gd/src/tests/coll-ext-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/coll-ext-test.lid	Sun May  3 19:54:58 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/coll-ext-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/coll-ext-test.lid,v 1.1.1.1 1998/05/03 19:54:58 andreas Exp $
 library: coll-ext-test
 executable: coll-ext-test
 unique-id-base: 732
+unit-prefix: collexttest
 entry-point: coll-ext-test:main
 
 coll-ext-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/dylan-test.lid ./tests/dylan-test.lid
--- /home/andreas/distro/gd/src/tests/dylan-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/dylan-test.lid	Sun May  3 19:54:58 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/dylan-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/dylan-test.lid,v 1.1.1.1 1998/05/03 19:54:58 andreas Exp $
 library: dylan-test
 executable: dylan-test
 unique-id-base: 732
+unit-prefix: dylantest
 entry-point: dylan-test:main
 
 dylan-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/format-out-test.lid ./tests/format-out-test.lid
--- /home/andreas/distro/gd/src/tests/format-out-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/format-out-test.lid	Sun May  3 19:54:58 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/format-out-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/format-out-test.lid,v 1.1.1.1 1998/05/03 19:54:58 andreas Exp $
 library: format-out-test
 executable: format-out-test
 unique-id-base: 732
+unit-prefix: formatouttest
 entry-point: format-out-test:main
 
 format-out-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/format-test.lid ./tests/format-test.lid
--- /home/andreas/distro/gd/src/tests/format-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/format-test.lid	Sun May  3 19:54:59 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/format-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/format-test.lid,v 1.1.1.1 1998/05/03 19:54:59 andreas Exp $
 library: format-test
 executable: format-test
 unique-id-base: 732
+unit-prefix: formattest
 entry-point: format-test:main
 
 format-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/itime-test.lid ./tests/itime-test.lid
--- /home/andreas/distro/gd/src/tests/itime-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/itime-test.lid	Sun May  3 19:54:58 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/itime-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/itime-test.lid,v 1.1.1.1 1998/05/03 19:54:58 andreas Exp $
 library: itime-test
 executable: itime-test
 unique-id-base: 732
+unit-prefix: itimetest
 
 itime-test-exports.dylan
 itime-test.dylan
diff -u -r /home/andreas/distro/gd/src/tests/matrix-test.lid ./tests/matrix-test.lid
--- /home/andreas/distro/gd/src/tests/matrix-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/matrix-test.lid	Sun May  3 19:54:58 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/matrix-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/matrix-test.lid,v 1.1.1.1 1998/05/03 19:54:58 andreas Exp $
 library: matrix-test
 executable: matrix-test
 unique-id-base: 732
+unit-prefix: matrixtest
 entry-point: matrix-test:main
 
 matrix-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/print-test.lid ./tests/print-test.lid
--- /home/andreas/distro/gd/src/tests/print-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/print-test.lid	Sun May  3 19:54:59 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/print-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/print-test.lid,v 1.1.1.1 1998/05/03 19:54:59 andreas Exp $
 library: print-test
 executable: print-test
 unique-id-base: 732
+unit-prefix: printtest
 entry-point: print-test:main
 
 print-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/random-test.lid ./tests/random-test.lid
--- /home/andreas/distro/gd/src/tests/random-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/random-test.lid	Sun May  3 19:54:59 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/random-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/random-test.lid,v 1.1.1.1 1998/05/03 19:54:59 andreas Exp $
 library: random-test
 executable: random-test
 unique-id-base: 732
+unit-prefix: randomtest
 entry-point: random-test:main
 
 random-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/regexp-test.lid ./tests/regexp-test.lid
--- /home/andreas/distro/gd/src/tests/regexp-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/regexp-test.lid	Sun May  3 19:54:57 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/regexp-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/regexp-test.lid,v 1.1.1.1 1998/05/03 19:54:57 andreas Exp $
 library: regexp-test
 executable: regexp-test
 unique-id-base: 732
+unit-prefix: regexptest
 entry-point: regexp-test:main
 
 regexp-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/stream-test.lid ./tests/stream-test.lid
--- /home/andreas/distro/gd/src/tests/stream-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/stream-test.lid	Sun May  3 19:54:59 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/stream-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/stream-test.lid,v 1.1.1.1 1998/05/03 19:54:59 andreas Exp $
 library: stream-test
 executable: stream-test
 unique-id-base: 732
+unit-prefix: streamtest
 entry-point: stream-test:main
 
 stream-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/table-ext-test.lid ./tests/table-ext-test.lid
--- /home/andreas/distro/gd/src/tests/table-ext-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/table-ext-test.lid	Sun May  3 19:54:59 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/table-ext-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/table-ext-test.lid,v 1.1.1.1 1998/05/03 19:54:59 andreas Exp $
 library: table-ext-test
 executable: table-ext-test
 unique-id-base: 732
+unit-prefix: tableexttest
 entry-point: table-ext-test:main
 
 table-ext-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tests/time-test.lid ./tests/time-test.lid
--- /home/andreas/distro/gd/src/tests/time-test.lid	Fri Jul 30 17:25:22 1999
+++ ./tests/time-test.lid	Sun May  3 19:54:57 1998
@@ -1,7 +1,8 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tests/time-test.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tests/time-test.lid,v 1.1.1.1 1998/05/03 19:54:57 andreas Exp $
 library: time-test
 executable: time-test
 unique-id-base: 732
+unit-prefix: timetest
 entry-point: time-test:main
 
 time-test-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tools/make-exports/Make-exports.lid ./tools/make-exports/Make-exports.lid
--- /home/andreas/distro/gd/src/tools/make-exports/Make-exports.lid	Fri Jul 30 17:25:22 1999
+++ ./tools/make-exports/Make-exports.lid	Sun May  3 19:55:57 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/make-exports/Make-exports.lid,v 1.2 1999/07/30 17:25:22 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/make-exports/Make-exports.lid,v 1.1.1.1 1998/05/03 19:55:57 andreas Exp $
 library: make-exports
+unit-prefix: mkexports
 unique-id-base: 5000
 executable: make-exports
 entry-point: make-exports:%main
diff -u -r /home/andreas/distro/gd/src/tools/melange/freebsd-c-decl.lid ./tools/melange/freebsd-c-decl.lid
--- /home/andreas/distro/gd/src/tools/melange/freebsd-c-decl.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/freebsd-c-decl.lid	Fri Jul 16 16:30:53 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/freebsd-c-decl.lid,v 1.4 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/freebsd-c-decl.lid,v 1.3 1999/07/16 16:30:53 housel Exp $
 library: melange-c
+unit-prefix: cdecl
 unique-id-base: 10000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/tools/melange/hp-c-decl.lid ./tools/melange/hp-c-decl.lid
--- /home/andreas/distro/gd/src/tools/melange/hp-c-decl.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/hp-c-decl.lid	Fri Jul 16 16:30:53 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/hp-c-decl.lid,v 1.4 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/hp-c-decl.lid,v 1.3 1999/07/16 16:30:53 housel Exp $
 library: melange-c
+unit-prefix: cdecl
 unique-id-base: 10000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/tools/melange/linux-c-decl.lid ./tools/melange/linux-c-decl.lid
--- /home/andreas/distro/gd/src/tools/melange/linux-c-decl.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/linux-c-decl.lid	Fri Jul 16 16:30:53 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/linux-c-decl.lid,v 1.4 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/linux-c-decl.lid,v 1.3 1999/07/16 16:30:53 housel Exp $
 library: melange-c
+unit-prefix: cdecl
 unique-id-base: 10000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/tools/melange/melange.lid ./tools/melange/melange.lid
--- /home/andreas/distro/gd/src/tools/melange/melange.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/melange.lid	Sun May  3 19:55:54 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/melange.lid,v 1.2 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/melange.lid,v 1.1.1.1 1998/05/03 19:55:54 andreas Exp $
 library: melange
+unit-prefix: ffi
 unique-id-base: 12000
 executable: melange
 entry-point: define-interface:%main
diff -u -r /home/andreas/distro/gd/src/tools/melange/openbsd-c-decl.lid ./tools/melange/openbsd-c-decl.lid
--- /home/andreas/distro/gd/src/tools/melange/openbsd-c-decl.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/openbsd-c-decl.lid	Fri Jul 16 16:30:53 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/openbsd-c-decl.lid,v 1.3 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/openbsd-c-decl.lid,v 1.2 1999/07/16 16:30:53 housel Exp $
 library: melange-c
+unit-prefix: cdecl
 unique-id-base: 10000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/tools/melange/solaris-c-decl.lid ./tools/melange/solaris-c-decl.lid
--- /home/andreas/distro/gd/src/tools/melange/solaris-c-decl.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/solaris-c-decl.lid	Fri Jul 16 16:30:53 1999
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/solaris-c-decl.lid,v 1.4 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/solaris-c-decl.lid,v 1.3 1999/07/16 16:30:53 housel Exp $
 library: melange-c
+unit-prefix: cdecl
 unique-id-base: 10000
 shared-library: no
 
diff -u -r /home/andreas/distro/gd/src/tools/melange/win32-vc-decl.lid ./tools/melange/win32-vc-decl.lid
--- /home/andreas/distro/gd/src/tools/melange/win32-vc-decl.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/melange/win32-vc-decl.lid	Sun May  3 19:55:54 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/win32-vc-decl.lid,v 1.2 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/melange/win32-vc-decl.lid,v 1.1.1.1 1998/05/03 19:55:54 andreas Exp $
 library: melange-c
+unit-prefix: cdecl
 unique-id-base: 10000
 
 c-exports.dylan
diff -u -r /home/andreas/distro/gd/src/tools/parsergen/Parsergen.lid ./tools/parsergen/Parsergen.lid
--- /home/andreas/distro/gd/src/tools/parsergen/Parsergen.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/parsergen/Parsergen.lid	Sun May  3 19:55:56 1998
@@ -1,5 +1,6 @@
-rcs-header: $Header: /home/cvsroot/gd/src/tools/parsergen/Parsergen.lid,v 1.2 1999/07/30 17:25:25 andreas Exp $
+rcs-header: $Header: /home/cvsroot/gd/src/tools/parsergen/Parsergen.lid,v 1.1.1.1 1998/05/03 19:55:56 andreas Exp $
 library: parsergen
+unit-prefix: parsergen
 unique-id-base: 5000
 executable: parsergen
 entry-point: parsergen:%main
diff -u -r /home/andreas/distro/gd/src/tools/versioner/Versioner.lid ./tools/versioner/Versioner.lid
--- /home/andreas/distro/gd/src/tools/versioner/Versioner.lid	Fri Jul 30 17:25:25 1999
+++ ./tools/versioner/Versioner.lid	Sun May  3 19:55:55 1998
@@ -1,4 +1,5 @@
 library: versioner
+unit-prefix: ver
 unique-id-base: 2284
 executable: versioner
 entry-point: versioner:%main
Index: tools/shared-misc/gen-makefile.in
===================================================================
RCS file: /home/cvsroot/gd/src/tools/shared-misc/gen-makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -u -r1.9 -r1.10
--- gen-makefile.in	1999/07/20 21:21:36	1.9
+++ ./tools/shared-misc/gen-makefile.in	1999/08/24 22:07:26	1.10
@@ -1,7 +1,7 @@
 #!@PERL@
 
 # Authors: William Lott, Nick Kramer
-# rcs-header: $Header: /home/cvsroot/gd/src/tools/shared-misc/gen-makefile.in,v 1.9 1999/07/20 21:21:36 housel Exp $
+# rcs-header: $Header: /home/cvsroot/gd/src/tools/shared-misc/gen-makefile.in,v 1.10 1999/08/24 22:07:26 andreas Exp $
 
 # Usage: gen-makefile [-pplatforms.descr] directory
 #
@@ -736,7 +736,12 @@
     local($library) = $lidfile{'library'} 
                           || die("No library: header in $lidfilename.lid.\n");
     $library =~ tr/A-Z/a-z/;
-    local($unit_prefix) = $lidfile{'unit_prefix'} || "$library";
+    local($unit_prefix);
+    if($enable_bootstrap && $bootstrap_compiler eq "d2c") {
+	$unit_prefix = $lidfile{'unit_prefix'} || "$library";
+    } else {
+	$unit_prefix = "$library";
+    };
     local($executable) = $lidfile{'executable'};
     local($executable_filename) = $executable . $dot_exe;
     local($shared_library) = $shared && ($lidfile{'shared_library'} ne 'no');
Index: tests/Makegen
===================================================================
RCS file: /home/cvsroot/gd/src/tests/Makegen,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -u -r1.9 -r1.10
--- ./tests/Makegen	1999/07/16 16:30:52	1.9
+++ ./tests/Makegen	1999/08/24 22:54:17	1.10
@@ -1,4 +1,6 @@
 
+$D2C = '$(BUILDROOT)/d2c/compiler/main/d2c';
+
 $D2CFLAGS = $d2c_runtime . '-L../common/streams -L../common/standard-io -L../common/print -L../common/format -L../d2c/runtime/random -L. -L../common/coll-ext -L../common/string-ext -L../common/table-ext -L../common/format-out -L../common/itime -L../common/regexp -L../common/matrix -L../common/time -L../common/getopt -L../d2c/runtime/melange';
 
 $shared = 0;