1 files changed, 73 insertions, 69 deletions

diff --git a/lang/dylan/pkg-plist b/lang/dylan/pkg-plist
index f4e1cd0f590f..4fc0e10debd6 100644
--- a/lang/dylan/pkg-plist
+++ b/lang/dylan/pkg-plist
@@ -1,8 +1,6 @@
 bin/d2c
 bin/dybug
 bin/gen-makefile
-bin/gobject-tool
-bin/libraries-test-suite-app
 bin/line-count
 bin/make-dylan-app
 bin/make-dylan-lib
@@ -30,16 +28,13 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/melange-support.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/random.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.la
@@ -49,10 +44,20 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/transcendental.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/time.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/transcendental-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/streams.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/time.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/streams-lib.dbc
@@ -77,22 +82,21 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/format-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/collection-extensions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/table-extensions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/collection-extensions-lib.dbc
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/table-extensions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/table-extensions-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/string-extensions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/string-extensions-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/regular-expressions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions-dylan.so
@@ -105,79 +109,60 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/format-out-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix-lib.dbc
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/time-lib.dbc
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-specs.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-test-suite.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/stream-extensions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/stream-extensions-lib.dbc
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/transcendental.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/locators.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/transcendental-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parse-arguments.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parse-arguments-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/io.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parse-arguments-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/base-file-system.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/base-file-system-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/time-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/threads.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/common-extensions.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/io.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/common-dylan.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/collections.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollections-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollections-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollections-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollections-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblibraries-test-suite-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblibraries-test-suite-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblibraries-test-suite-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblibraries-test-suite-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/io-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/file-system.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system-dylan.so.0
@@ -194,27 +179,53 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/random.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libraries-test-suite.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/locators.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/network.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parser-utilities.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/ansi-c.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/c-parser.lib.du
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so.0
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.la
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/glib.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-test-suite.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-specs.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-utilities.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gdk.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.a
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-geometry.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-geometry-dylan.so.0
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-geometry-dylan.so
@@ -228,12 +239,6 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/c-parser.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-sheets.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.so.0
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.so
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/glib.lib.du
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-utilities.lib.du
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.so.0
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.so
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.la
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.a
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.la
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.a
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-graphics.lib.du
@@ -246,12 +251,13 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/c-parser.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.la
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gtk.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-layouts.lib.du
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/commands.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.so.0
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.la
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/commands.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.so.0
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.la
@@ -280,12 +286,10 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/c-parser.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.la
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.a
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gdk.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.so.0
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.la
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.a
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gtk.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.so.0
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.la
@@ -297,9 +301,9 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/c-parser.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-duim-dylan.a
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim.lib.du
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.so.0
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.a
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.so
 %%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.a
 @exec mkdir %D/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan-user
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan-user
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/elisp