commit 372e9667dfd5fcce89be447b5bbc169c8a43322e
from: rsc <devnull@localhost>
date: Tue Jan 04 22:10:29 2005 UTC

Goodbye SHORTLIB

commit - eb423b5cc00a36f02129722e85e36eb9da1a60d3
commit + 372e9667dfd5fcce89be447b5bbc169c8a43322e
blob - 06d996f02ce2e28f4b1aea7a121b65fe1ebd7f32
blob + 67326cdb58b021b79b0fdecc48adec368623b3ab
--- src/cmd/9660/mkfile
+++ src/cmd/9660/mkfile
@@ -22,7 +22,6 @@ DFILES=\
 
 HFILES=iso9660.h
 
-SHORTLIB=sec disk bio 9
 <$PLAN9/src/mkmany
 
 $O.dump9660: $DFILES
blob - 35c938c11069f5a8e9926e1109fb447c006cbb8f
blob + 30812c3fa8a2009ebe1cccaa0177498d1fc3fa67
--- src/cmd/acid/mkfile
+++ src/cmd/acid/mkfile
@@ -19,7 +19,6 @@ YFILES=dbg.y
 HFILES=acid.h
 
 
-SHORTLIB=mach regexp9 bio 9
 
 <$PLAN9/src/mkone
 
blob - e896717176ce17eefe9bf612845ca751033b9596
blob + a48a8011bf82d9781318126d444d01e9e295150a
--- src/cmd/acidtypes/mkfile
+++ src/cmd/acidtypes/mkfile
@@ -18,7 +18,6 @@ HFILES=\
 	../../libmach/stabs.h\
 
 CFLAGS=-I../../libmach $CFLAGS
-SHORTLIB=mach bio 9
 
 <$PLAN9/src/mkone
 
blob - f4db22f10f9dc301a891a296235a5cce31f70384
blob + cbd39cf1a00a1e2c89590103a5099296202b0ec5
--- src/cmd/astro/mkfile
+++ src/cmd/astro/mkfile
@@ -35,6 +35,5 @@ OFILES=\
 
 HFILES=astro.h\
 
-SHORTLIB=bio 9
 
 <$PLAN9/src/mkone
blob - 4eafa5c6b3fa49db5ac31f8ae273b12d010c0efa
blob + 198e32146b5fb80146141c38e9a78f2af66e687a
--- src/cmd/auxstats/mkfile
+++ src/cmd/auxstats/mkfile
@@ -9,7 +9,6 @@ OFILES=\
 HFILES=\
 	dat.h\
 
-SHORTLIB=bio 9
 
 <$PLAN9/src/mkone
 
blob - d846b937ec4d5675e3235a0b8305d7cd350399d6
blob + dd26e0a5a75a74d8f157c0b1226ef1908a1361d0
--- src/cmd/bzip2/mkfile
+++ src/cmd/bzip2/mkfile
@@ -13,7 +13,6 @@ HFILES=\
 
 LIB=lib/libbzip2.a
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkmany
 
 CFLAGS=$CFLAGS -DPLAN9 -Ilib
blob - d73ecc85e5fa0611654047ef27fb1669841a8b14
blob + 00e7a7531696e98cc3b04c26c88babe990cd42f0
--- src/cmd/db/mkfile
+++ src/cmd/db/mkfile
@@ -18,7 +18,6 @@ OFILES=\
 HFILES=defs.h\
 	fns.h\
 
-SHORTLIB=mach bio 9
 
 <$PLAN9/src/mkone
 
blob - 8292a1faf3e982d0471fb8c09a9ec335bb9e2b63
blob + 43d1e1563fdbf3197c6221e6067bad55ad6b3cc1
--- src/cmd/dict/mkfile
+++ src/cmd/dict/mkfile
@@ -10,7 +10,6 @@ OFILES=dict.$O\
 
 HFILES=dict.h kuten.h
 
-SHORTLIB=bio regexp9 9
 <$PLAN9/src/mkone
 
 mkindex: mkindex.$O $LFILES utils.$O
blob - feb3a0418edac9e447536eb1b7ef2b5f15ebab76
blob + f0d39293f7f2ea2951e5e800bea96e0c94777f0a
--- src/cmd/diff/mkfile
+++ src/cmd/diff/mkfile
@@ -9,6 +9,5 @@ OFILES=\
 
 HFILES=diff.h
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 
blob - bdb33086df16cf9561ba6030797a47ca16d31371
blob + e33b8b5b068ef00d1824edb79a572af43f21929b
--- src/cmd/draw/mkfile
+++ 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
-
blob - 08a65d5dcac5c3c096a619a2f87ffc9397e19a68
blob + e66212ee99820b96da39b4c336eb204e73207ec8
--- src/cmd/eqn/mkfile
+++ src/cmd/eqn/mkfile
@@ -30,7 +30,6 @@ YFILES=eqn.y\
 HFILES=e.h\
 	y.tab.h\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 
 YFLAGS=-d -S
blob - 7fb7ffde56754575afb5739f64590242e9fb5765
blob + 3a30cd522924af7b0be611da49a37df58205effd
--- src/cmd/factotum/mkfile
+++ src/cmd/factotum/mkfile
@@ -25,7 +25,6 @@ OFILES=\
 
 HFILES=dat.h
 
-SHORTLIB=auth authsrv sec mp 9p thread 9
 <$PLAN9/src/mkone
 
 $O.test: test.$O
blob - 872497d1222c20eda3c7ec8a2ebe186b38f6f8e8
blob + 03633f3bd296d6db4ce2fab74bd032dfde71a4cb
--- src/cmd/grap/mkfile
+++ src/cmd/grap/mkfile
@@ -22,7 +22,6 @@ YFILES=grap.y\
 
 LFILES=grapl.lx\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 YFLAGS = -d -S
 LEX=9lex
blob - 38619325112fbf7ed049e9a5fb07ccf66737294d
blob + aa2400945beb486304dda4f3fd0d6834fec8acf4
--- src/cmd/grep/mkfile
+++ src/cmd/grep/mkfile
@@ -15,5 +15,4 @@ OFILES=\
 
 YFILES=grep.y\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
blob - 2894f1fbafa8a36b3dfec582b4a499e3786266a5
blob + a7728a322864be061987bc7cdedb0be3a2e1817a
--- src/cmd/gzip/mkfile
+++ src/cmd/gzip/mkfile
@@ -10,6 +10,5 @@ TARG=\
 	zip\
 	unzip\
 
-SHORTLIB=flate bio 9
 
 <$PLAN9/src/mkmany
blob - dd43b0fb641d21e9cc24acbae66bf020edc84281
blob + da862f36198bca0ea38eada05d78378e8ea04fcb
--- src/cmd/hoc/mkfile
+++ src/cmd/hoc/mkfile
@@ -14,6 +14,5 @@ OFILES=\
 
 YFILES=hoc.y\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 
blob - 7bf8fbb61f524a9fefae2a0f100c2adbdba3fad2
blob + 21f58bad860a552ed73f0ba3ce4c2e17257dd44f
--- src/cmd/htmlfmt/mkfile
+++ src/cmd/htmlfmt/mkfile
@@ -10,7 +10,6 @@ HFILES=\
 	dat.h\
 	$PLAN9/include/html.h\
 
-SHORTLIB=bio regexp9 html 9
 
 <$PLAN9/src/mkone
 
blob - e73b47661fa47078ab21ccae8bb3b4fd0a0ef0b9
blob + 938afbd1d255dc6a754f6ed0be99a375cd7f4272
--- src/cmd/jpg/mkfile
+++ src/cmd/jpg/mkfile
@@ -19,9 +19,6 @@ IMFILES=\
 
 HFILES=imagefile.h\
 
-SHORTLIB=draw flate bio 9
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11
-
 <$PLAN9/src/mkmany
 
 $O.jpg:		$IMFILES readjpg.$O jpg.$O
blob - ffcf875d5e5e0306348a428a4bdc2467b01cc7d7
blob + 7b6e8fdcbeadc88f305bf6db7849b95b5df1b00a
--- src/cmd/lex/mkfile
+++ src/cmd/lex/mkfile
@@ -11,15 +11,6 @@ HFILES=ldefs.h\
 
 YFILES=parser.y\
 
-SHORTLIB=bio 9
-UPDATE=\
-	mkfile\
-	$HFILES\
-	lmain.c\
-	sub1.c\
-	sub2.c\
-	header.c
-
 <$PLAN9/src/mkone
 
 installall:V:
blob - 6e8f52b9a73269284450685d670b69bed3a37bb8
blob + ec891afc77a7762efe4ab171e6dc33c3e4df3f38
--- src/cmd/mk/mkfile
+++ src/cmd/mk/mkfile
@@ -16,9 +16,11 @@ OFILES=\
 	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 @@ HFILES=\
 	mk.h\
 	fns.h\
 
-SHORTLIB=regexp9 bio 9
 
 <$PLAN9/src/mkone
 
blob - 5842de57777f2232252968e6c722db2d9866bbb9
blob + dc5bc941961b5532e92bbfe545b37eb116d57427
--- src/cmd/mnihongo/mkfile
+++ 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
blob - b27e07db67680144a69093106f84285e7042053a
blob + 10199f8c5ef9760e7b0b7c10ffe275bb52516f49
--- src/cmd/pic/mkfile
+++ src/cmd/pic/mkfile
@@ -23,7 +23,6 @@ HFILES=pic.h\
 
 YFILES=picy.y\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 YFLAGS=-S -d
 LEX=9lex
blob - 77ebd7e1f30c39e9391b0acf3ccf5d2700e596c9
blob + 40acd9e8bf054477c136607e3c7b8124f3cb9a28
--- src/cmd/plot/mkfile
+++ src/cmd/plot/mkfile
@@ -7,9 +7,6 @@ HFILES=plot.h\
 
 LIB=libplot.a
 
-SHORTLIB=frame draw bio 9
-LDFLAGS=$LDFLAGS -L$X11/lib -lX11
-
 <$PLAN9/src/mkone
 
 $LIB:
blob - 902ebf01da3aae9be84c5cf23ac28d62b7a441d4
blob + 1aeec3b92f457ebc32ef904879892b73acf2b009
--- src/cmd/plumb/mkfile
+++ 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
 
blob - e677d39ec5a584463d00484e4943b64a922ae0fe
blob + d7e619e085b9bfac948088c50dabd2c503e3cfb1
--- src/cmd/sam/mkfile
+++ src/cmd/sam/mkfile
@@ -26,6 +26,5 @@ HFILES=sam.h\
 	errors.h\
 	mesg.h\
 
-SHORTLIB=plumb 9
 
 <$PLAN9/src/mkone
blob - 784549090b16d57a70701d1a6a8b1437cfa49ab0
blob + 3ffa496c72d09de2b43eb12910889052b2d40a71
--- src/cmd/samterm/mkfile
+++ src/cmd/samterm/mkfile
@@ -21,7 +21,5 @@ HFILES=\
 	$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
blob - c0258a838704510f3ce1860f7bdb33fd996b45d2
blob + 23ff2fd415702d3d9957f60636432510e28807a2
--- src/cmd/scat/mkfile
+++ src/cmd/scat/mkfile
@@ -18,9 +18,7 @@ OFILES=scat.$O\
 
 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
 
blob - f43984670ab29ad230202c6c3817f3de08769d5f
blob + 8d9e0f8e093e1118b57084a2ea4b121479f3f987
--- src/cmd/secstore/mkfile
+++ src/cmd/secstore/mkfile
@@ -14,7 +14,6 @@ OFILES =\
 
 
 TARG=aescbc secstore
-SHORTLIB=sec mp regexp9 thread bio 9
 
 <$PLAN9/src/mkmany
 
blob - b92c125f451ee2af860e59e56638b4dcafad909b
blob + 0f0198264df04824cd69148655b9d376154fa919
--- src/cmd/spell/mkfile
+++ src/cmd/spell/mkfile
@@ -6,6 +6,5 @@ OFILES=sprog.$O\
 HFILES =\
 	code.h\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 
blob - cdaf4a7ebd04cb8578d652d9e72c4f4dd80598fd
blob + 3768727d944f6bfe0819181c1ca77551cd04242c
--- src/cmd/tbl/mkfile
+++ src/cmd/tbl/mkfile
@@ -28,5 +28,4 @@ OFILES=\
 HFILES=\
 	t.h\
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
blob - c410a0c05e55f2fde576bbaffe96a7ce80517ee9
blob + 3d12279ecca8d383a0027332f1f1a903456cc471
--- src/cmd/tcs/mkfile
+++ src/cmd/tcs/mkfile
@@ -12,7 +12,6 @@ OFILES=tcs.$O\
 	ksc.$O\
 	big5.$O
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 CFLAGS= -DPLAN9 $CFLAGS
 
blob - c02084e7f897fd8b499ba33e0f20fa443086f592
blob + 17eb14af9095be1c2f7157bdd402e6d8edaad20a
--- src/cmd/troff/mkfile
+++ src/cmd/troff/mkfile
@@ -26,7 +26,6 @@ HFILES=tdef.h\
 	dwbinit.h\
 
 
-SHORTLIB=bio 9
 <$PLAN9/src/mkone
 CFLAGS=-c -DUNICODE
 
blob - cd619074d379e95858cf11ca0f4ad7d7959d7db5
blob + a5db971c3479a08161b8a2a89188619f06f9fc9b
--- src/cmd/vac/mkfile
+++ src/cmd/vac/mkfile
@@ -6,7 +6,6 @@ LIBFILES=\
 	fs\
 	pack\
 
-SHORTLIB=venti sec mux thread bio 9
 LIB=${LIBFILES:%=%.$O}
 
 HFILES=\
@@ -17,16 +16,8 @@ HFILES=\
 	dat.h\
 	fns.h\
 
-TARG=vac vtdump
+TARG=vac # vtdump
 
-CFILES=${TARG:%=%.c} ${LIBFILES:%=%.c} srcload.c vactest.c
-
-UPDATE=\
-	mkfile\
-	$CFILES\
-	$HFILES\
-	${TARG:%=/386/bin/%}
-
 default:V: all
 
 test:V: $O.srcload $O.wtest $O.rtest $O.vtdump $O.vtread
blob - bb31f50a151095fccb6dc2520939dcb29785acb8
blob + c6f9ef446fb3d0e3ad7276a5814a86d6cfa5c629
--- src/cmd/venti/mkfile
+++ src/cmd/venti/mkfile
@@ -32,7 +32,6 @@ LIBOFILES=\
 SLIB=libvs.a
 
 LIB=$SLIB
-SHORTLIB=venti httpd bin sec thread 9
 
 HFILES=	dat.h\
 	fns.h\