Goodbye SHORTLIB

src/cmd/9660/mkfile

diff --git a/src/cmd/9660/mkfile b/src/cmd/9660/mkfile
index 06d996f..67326cd 100644
--- a/src/cmd/9660/mkfile
+++ b/src/cmd/9660/mkfile
@@ -22,7 +22,6 @@
 
 HFILES=iso9660.h
 
-SHORTLIB=sec disk bio 9
 <$PLAN9/src/mkmany
 
 $O.dump9660: $DFILES

src/cmd/acid/mkfile

diff --git a/src/cmd/acid/mkfile b/src/cmd/acid/mkfile
index 35c938c..30812c3 100644
--- a/src/cmd/acid/mkfile
+++ b/src/cmd/acid/mkfile
@@ -19,7 +19,6 @@
 HFILES=acid.h
 
 
-SHORTLIB=mach regexp9 bio 9
 
 <$PLAN9/src/mkone
 

src/cmd/acidtypes/mkfile

diff --git a/src/cmd/acidtypes/mkfile b/src/cmd/acidtypes/mkfile
index e896717..a48a801 100644
--- a/src/cmd/acidtypes/mkfile
+++ b/src/cmd/acidtypes/mkfile
@@ -18,7 +18,6 @@
 	../../libmach/stabs.h\
 
 CFLAGS=-I../../libmach $CFLAGS
-SHORTLIB=mach bio 9
 
 <$PLAN9/src/mkone
 

src/cmd/astro/mkfile

diff --git a/src/cmd/astro/mkfile b/src/cmd/astro/mkfile
index f4db22f..cbd39cf 100644
--- a/src/cmd/astro/mkfile
+++ b/src/cmd/astro/mkfile
@@ -35,6 +35,5 @@
 
 HFILES=astro.h\
 
-SHORTLIB=bio 9
 
 <$PLAN9/src/mkone

src/cmd/auxstats/mkfile

diff --git a/src/cmd/auxstats/mkfile b/src/cmd/auxstats/mkfile
index 4eafa5c..198e321 100644
--- a/src/cmd/auxstats/mkfile
+++ b/src/cmd/auxstats/mkfile
@@ -9,7 +9,6 @@
 HFILES=\
 	dat.h\
 
-SHORTLIB=bio 9
 
 <$PLAN9/src/mkone
 

src/cmd/bzip2/mkfile

diff --git a/src/cmd/bzip2/mkfile b/src/cmd/bzip2/mkfile
index d846b93..dd26e0a 100644
--- a/src/cmd/bzip2/mkfile
+++ b/src/cmd/bzip2/mkfile
@@ -13,7 +13,6 @@
 
 LIB=lib/libbzip2.a
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkmany
 
 CFLAGS=$CFLAGS -DPLAN9 -Ilib

src/cmd/db/mkfile

diff --git a/src/cmd/db/mkfile b/src/cmd/db/mkfile
index d73ecc8..00e7a75 100644
--- a/src/cmd/db/mkfile
+++ b/src/cmd/db/mkfile
@@ -18,7 +18,6 @@
 HFILES=defs.h\
 	fns.h\
 
-SHORTLIB=mach bio 9
 
 <$PLAN9/src/mkone
 

src/cmd/dict/mkfile

diff --git a/src/cmd/dict/mkfile b/src/cmd/dict/mkfile
index 8292a1f..43d1e15 100644
--- a/src/cmd/dict/mkfile
+++ b/src/cmd/dict/mkfile
@@ -10,7 +10,6 @@
 
 HFILES=dict.h kuten.h
 
-SHORTLIB=bio regexp9 9
 <$PLAN9/src/mkone
 
 mkindex: mkindex.$O $LFILES utils.$O

src/cmd/diff/mkfile

diff --git a/src/cmd/diff/mkfile b/src/cmd/diff/mkfile
index feb3a04..f0d3929 100644
--- a/src/cmd/diff/mkfile
+++ b/src/cmd/diff/mkfile
@@ -9,6 +9,5 @@
 
 HFILES=diff.h
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 

src/cmd/draw/mkfile

diff --git a/src/cmd/draw/mkfile b/src/cmd/draw/mkfile
index bdb3308..e33b8b5 100644
--- a/src/cmd/draw/mkfile
+++ b/src/cmd/draw/mkfile
@@ -1,18 +1,5 @@
 <$PLAN9/src/mkhdr
 
 TARG=`ls *.[cy] | sed 's/\.[cy]//'`
-SHORTLIB=draw bio 9
 
 <$PLAN9/src/mkmany
-
-$O.tcolors: tcolors.$O
-	$LD -o $target tcolors.$O -ldraw -lthread -l9 $LDFLAGS
-
-$O.mc: mc.$O
-	$LD -o $target mc.$O -lfs -lmux -ldraw -lthread -lbio -l9 $LDFLAGS
-
-$O.stats: stats.$O
-	$LD -o $target stats.$O -ldraw -lthread -lbio -l9 $LDFLAGS
-
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11
-

src/cmd/eqn/mkfile

diff --git a/src/cmd/eqn/mkfile b/src/cmd/eqn/mkfile
index 08a65d5..e66212e 100644
--- a/src/cmd/eqn/mkfile
+++ b/src/cmd/eqn/mkfile
@@ -30,7 +30,6 @@
 HFILES=e.h\
 	y.tab.h\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 
 YFLAGS=-d -S

src/cmd/factotum/mkfile

diff --git a/src/cmd/factotum/mkfile b/src/cmd/factotum/mkfile
index 7fb7ffd..3a30cd5 100644
--- a/src/cmd/factotum/mkfile
+++ b/src/cmd/factotum/mkfile
@@ -25,7 +25,6 @@
 
 HFILES=dat.h
 
-SHORTLIB=auth authsrv sec mp 9p thread 9
 <$PLAN9/src/mkone
 
 $O.test: test.$O

src/cmd/grap/mkfile

diff --git a/src/cmd/grap/mkfile b/src/cmd/grap/mkfile
index 872497d..03633f3 100644
--- a/src/cmd/grap/mkfile
+++ b/src/cmd/grap/mkfile
@@ -22,7 +22,6 @@
 
 LFILES=grapl.lx\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 YFLAGS = -d -S
 LEX=9lex

src/cmd/grep/mkfile

diff --git a/src/cmd/grep/mkfile b/src/cmd/grep/mkfile
index 3861932..aa24009 100644
--- a/src/cmd/grep/mkfile
+++ b/src/cmd/grep/mkfile
@@ -15,5 +15,4 @@
 
 YFILES=grep.y\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone

src/cmd/gzip/mkfile

diff --git a/src/cmd/gzip/mkfile b/src/cmd/gzip/mkfile
index 2894f1f..a7728a3 100644
--- a/src/cmd/gzip/mkfile
+++ b/src/cmd/gzip/mkfile
@@ -10,6 +10,5 @@
 	zip\
 	unzip\
 
-SHORTLIB=flate bio 9
 
 <$PLAN9/src/mkmany

src/cmd/hoc/mkfile

diff --git a/src/cmd/hoc/mkfile b/src/cmd/hoc/mkfile
index dd43b0f..da862f3 100644
--- a/src/cmd/hoc/mkfile
+++ b/src/cmd/hoc/mkfile
@@ -14,6 +14,5 @@
 
 YFILES=hoc.y\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 

src/cmd/htmlfmt/mkfile

diff --git a/src/cmd/htmlfmt/mkfile b/src/cmd/htmlfmt/mkfile
index 7bf8fbb..21f58ba 100644
--- a/src/cmd/htmlfmt/mkfile
+++ b/src/cmd/htmlfmt/mkfile
@@ -10,7 +10,6 @@
 	dat.h\
 	$PLAN9/include/html.h\
 
-SHORTLIB=bio regexp9 html 9
 
 <$PLAN9/src/mkone
 

src/cmd/jpg/mkfile

diff --git a/src/cmd/jpg/mkfile b/src/cmd/jpg/mkfile
index e73b476..938afbd 100644
--- a/src/cmd/jpg/mkfile
+++ b/src/cmd/jpg/mkfile
@@ -19,9 +19,6 @@
 
 HFILES=imagefile.h\
 
-SHORTLIB=draw flate bio 9
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11
-
 <$PLAN9/src/mkmany
 
 $O.jpg:		$IMFILES readjpg.$O jpg.$O

src/cmd/lex/mkfile

diff --git a/src/cmd/lex/mkfile b/src/cmd/lex/mkfile
index ffcf875..7b6e8fd 100644
--- a/src/cmd/lex/mkfile
+++ b/src/cmd/lex/mkfile
@@ -11,15 +11,6 @@
 
 YFILES=parser.y\
 
-SHORTLIB=bio 9
-UPDATE=\
-	mkfile\
-	$HFILES\
-	lmain.c\
-	sub1.c\
-	sub2.c\
-	header.c
-
 <$PLAN9/src/mkone
 
 installall:V:

src/cmd/mk/mkfile

diff --git a/src/cmd/mk/mkfile b/src/cmd/mk/mkfile
index 6e8f52b..ec891af 100644
--- a/src/cmd/mk/mkfile
+++ b/src/cmd/mk/mkfile
@@ -16,9 +16,11 @@
 	mk.$O\
 	parse.$O\
 	recipe.$O\
+	rc.$O\
 	rule.$O\
 	run.$O\
 	sh.$O\
+	shell.$O\
 	shprint.$O\
 	symtab.$O\
 	var.$O\
@@ -30,7 +32,6 @@
 	mk.h\
 	fns.h\
 
-SHORTLIB=regexp9 bio 9
 
 <$PLAN9/src/mkone
 

src/cmd/mnihongo/mkfile

diff --git a/src/cmd/mnihongo/mkfile b/src/cmd/mnihongo/mkfile
index 5842de5..dc5bc94 100644
--- a/src/cmd/mnihongo/mkfile
+++ b/src/cmd/mnihongo/mkfile
@@ -1,10 +1,8 @@
 <$PLAN9/src/mkhdr
 
-SHORTLIB=draw bio 9
 
 TARG=mnihongo
 OFILES=mnihongo.$O
 
 <$PLAN9/src/mkone
 
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11

src/cmd/pic/mkfile

diff --git a/src/cmd/pic/mkfile b/src/cmd/pic/mkfile
index b27e07d..10199f8 100644
--- a/src/cmd/pic/mkfile
+++ b/src/cmd/pic/mkfile
@@ -23,7 +23,6 @@
 
 YFILES=picy.y\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 YFLAGS=-S -d
 LEX=9lex

src/cmd/plot/mkfile

diff --git a/src/cmd/plot/mkfile b/src/cmd/plot/mkfile
index 77ebd7e..40acd9e 100644
--- a/src/cmd/plot/mkfile
+++ b/src/cmd/plot/mkfile
@@ -7,9 +7,6 @@
 
 LIB=libplot.a
 
-SHORTLIB=frame draw bio 9
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11
-
 <$PLAN9/src/mkone
 
 $LIB:

src/cmd/plumb/mkfile

diff --git a/src/cmd/plumb/mkfile b/src/cmd/plumb/mkfile
index 902ebf0..1aeec3b 100644
--- a/src/cmd/plumb/mkfile
+++ b/src/cmd/plumb/mkfile
@@ -1,7 +1,6 @@
 <$PLAN9/src/mkhdr
 
 TARG=plumber plumb
-SHORTLIB=plumb fs mux thread regexp9 bio 9
 
 <$PLAN9/src/mkmany
 

src/cmd/sam/mkfile

diff --git a/src/cmd/sam/mkfile b/src/cmd/sam/mkfile
index e677d39..d7e619e 100644
--- a/src/cmd/sam/mkfile
+++ b/src/cmd/sam/mkfile
@@ -26,6 +26,5 @@
 	errors.h\
 	mesg.h\
 
-SHORTLIB=plumb 9
 
 <$PLAN9/src/mkone

src/cmd/samterm/mkfile

diff --git a/src/cmd/samterm/mkfile b/src/cmd/samterm/mkfile
index 7845490..3ffa496 100644
--- a/src/cmd/samterm/mkfile
+++ b/src/cmd/samterm/mkfile
@@ -21,7 +21,5 @@
 	$PLAN9/include/draw.h\
 
 CFLAGS=$CFLAGS -I../sam
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11 -lm
-SHORTLIB=frame draw plumb fs mux thread regexp9 bio 9
 
 <$PLAN9/src/mkone

src/cmd/scat/mkfile

diff --git a/src/cmd/scat/mkfile b/src/cmd/scat/mkfile
index c0258a8..23ff2fd 100644
--- a/src/cmd/scat/mkfile
+++ b/src/cmd/scat/mkfile
@@ -18,9 +18,7 @@
 
 HFILES=sky.h
 CFLAGS=$CFLAGS -I../map
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11
 
-SHORTLIB=draw bio 9
 LIB=../map/libmap/libmap.a
 <$PLAN9/src/mkone
 

src/cmd/secstore/mkfile

diff --git a/src/cmd/secstore/mkfile b/src/cmd/secstore/mkfile
index f439846..8d9e0f8 100644
--- a/src/cmd/secstore/mkfile
+++ b/src/cmd/secstore/mkfile
@@ -14,7 +14,6 @@
 
 
 TARG=aescbc secstore
-SHORTLIB=sec mp regexp9 thread bio 9
 
 <$PLAN9/src/mkmany
 

src/cmd/spell/mkfile

diff --git a/src/cmd/spell/mkfile b/src/cmd/spell/mkfile
index b92c125..0f01982 100644
--- a/src/cmd/spell/mkfile
+++ b/src/cmd/spell/mkfile
@@ -6,6 +6,5 @@
 HFILES =\
 	code.h\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 

src/cmd/tbl/mkfile

diff --git a/src/cmd/tbl/mkfile b/src/cmd/tbl/mkfile
index cdaf4a7..3768727 100644
--- a/src/cmd/tbl/mkfile
+++ b/src/cmd/tbl/mkfile
@@ -28,5 +28,4 @@
 HFILES=\
 	t.h\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone

src/cmd/tcs/mkfile

diff --git a/src/cmd/tcs/mkfile b/src/cmd/tcs/mkfile
index c410a0c..3d12279 100644
--- a/src/cmd/tcs/mkfile
+++ b/src/cmd/tcs/mkfile
@@ -12,7 +12,6 @@
 	ksc.$O\
 	big5.$O
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 CFLAGS= -DPLAN9 $CFLAGS
 

src/cmd/troff/mkfile

diff --git a/src/cmd/troff/mkfile b/src/cmd/troff/mkfile
index c02084e..17eb14a 100644
--- a/src/cmd/troff/mkfile
+++ b/src/cmd/troff/mkfile
@@ -26,7 +26,6 @@
 	dwbinit.h\
 
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 CFLAGS=-c -DUNICODE
 

src/cmd/vac/mkfile

diff --git a/src/cmd/vac/mkfile b/src/cmd/vac/mkfile
index cd61907..a5db971 100644
--- a/src/cmd/vac/mkfile
+++ b/src/cmd/vac/mkfile
@@ -6,7 +6,6 @@
 	fs\
 	pack\
 
-SHORTLIB=venti sec mux thread bio 9
 LIB=${LIBFILES:%=%.$O}
 
 HFILES=\
@@ -17,15 +16,7 @@
 	dat.h\
 	fns.h\
 
-TARG=vac vtdump
-
-CFILES=${TARG:%=%.c} ${LIBFILES:%=%.c} srcload.c vactest.c
-
-UPDATE=\
-	mkfile\
-	$CFILES\
-	$HFILES\
-	${TARG:%=/386/bin/%}
+TARG=vac # vtdump
 
 default:V: all
 

src/cmd/venti/mkfile

diff --git a/src/cmd/venti/mkfile b/src/cmd/venti/mkfile
index bb31f50..c6f9ef4 100644
--- a/src/cmd/venti/mkfile
+++ b/src/cmd/venti/mkfile
@@ -32,7 +32,6 @@
 SLIB=libvs.a
 
 LIB=$SLIB
-SHORTLIB=venti httpd bin sec thread 9
 
 HFILES=	dat.h\
 	fns.h\