Update mkmk.sh.

src/lib9/mkfile

@@ -65,9 +65,7 @@ UTFOFILES=\
 	utfrune.$O\
 	utfutf.$O\
 
-OFILES=\
+LIB9OFILES=\
-	$FMTOFILES\
-	$UTFOFILES\
 	_exits.$O\
 	_p9dialparse.$O\
 	_p9dir.$O\
@@ -145,6 +143,11 @@ OFILES=\
 	wait.$O\
 	waitpid.$O\
 
+OFILES=\
+	$LIB9OFILES\
+	$FMTOFILES\
+	$UTFOFILES\
+
 HFILES=\
 	$PLAN9/include/lib9.h\
 

src/mkfile

@@ -19,15 +19,16 @@ DIRS=\
 <mkdirs
 
 MKDIRS=\
-	libutf\
-	libfmt\
 	libbio\
 	libregexp\
 	cmd/mk\
 
 mkmk.sh:VD:
 	(
-		for i in $MKDIRS
+		echo cd lib9
+		(cd lib9; mk -n -a 'LIB9OFILES=' install)
+		echo cd ..
+		for i in libbio libregexp cmd/mk
 		do	
 			echo cd $i
 			(cd $i; mk -n -a install)

src/mkmk.sh

@@ -1,62 +1,59 @@
-cd libutf
+cd lib9
-9c  rune.c
+9c  -Ifmt fmt/dofmt.c
-9c  runestrcat.c
+9c  -Ifmt fmt/errfmt.c
-9c  runestrchr.c
+9c  -Ifmt fmt/fltfmt.c
-9c  runestrcmp.c
+9c  -Ifmt fmt/fmt.c
-9c  runestrcpy.c
+9c  -Ifmt fmt/fmtfd.c
-9c  runestrdup.c
+9c  -Ifmt fmt/fmtfdflush.c
-9c  runestrlen.c
+9c  -Ifmt fmt/fmtlock.c
-9c  runestrecpy.c
+9c  -Ifmt fmt/fmtprint.c
-9c  runestrncat.c
+9c  -Ifmt fmt/fmtquote.c
-9c  runestrncmp.c
+9c  -Ifmt fmt/fmtrune.c
-9c  runestrncpy.c
+9c  -Ifmt fmt/fmtstr.c
-9c  runestrrchr.c
+9c  -Ifmt fmt/fmtvprint.c
-9c  runestrstr.c
+9c  -Ifmt fmt/fprint.c
-9c  runetype.c
+9c  -Ifmt fmt/nan64.c
-9c  utfecpy.c
+9c  -Ifmt fmt/print.c
-9c  utflen.c
+9c  -Ifmt fmt/runefmtstr.c
-9c  utfnlen.c
+9c  -Ifmt fmt/runeseprint.c
-9c  utfrrune.c
+9c  -Ifmt fmt/runesmprint.c
-9c  utfrune.c
+9c  -Ifmt fmt/runesnprint.c
-9c  utfutf.c
+9c  -Ifmt fmt/runesprint.c
-9ar rvc ../../lib/libutf.a rune.o runestrcat.o runestrchr.o runestrcmp.o runestrcpy.o runestrdup.o runestrlen.o runestrecpy.o runestrncat.o runestrncmp.o runestrncpy.o runestrrchr.o runestrstr.o runetype.o utfecpy.o utflen.o utfnlen.o utfrrune.o utfrune.o utfutf.o
+9c  -Ifmt fmt/runevseprint.c
-cd ..
+9c  -Ifmt fmt/runevsmprint.c
-cd libfmt
+9c  -Ifmt fmt/runevsnprint.c
-9c  dofmt.c
+9c  -Ifmt fmt/seprint.c
-9c  errfmt.c
+9c  -Ifmt fmt/smprint.c
-9c  fltfmt.c
+9c  -Ifmt fmt/snprint.c
-9c  fmt.c
+9c  -Ifmt fmt/sprint.c
-9c  fmtfd.c
+9c  -Ifmt fmt/strtod.c
-9c  fmtfdflush.c
+9c  -Ifmt fmt/vfprint.c
-9c  fmtlock.c
+9c  -Ifmt fmt/vseprint.c
-9c  fmtprint.c
+9c  -Ifmt fmt/vsmprint.c
-9c  fmtquote.c
+9c  -Ifmt fmt/vsnprint.c
-9c  fmtrune.c
+9c  -Ifmt fmt/charstod.c
-9c  fmtstr.c
+9c  -Ifmt fmt/pow10.c
-9c  fmtvprint.c
+9c  utf/rune.c
-9c  fprint.c
+9c  utf/runestrcat.c
-9c  nan64.c
+9c  utf/runestrchr.c
-9c  print.c
+9c  utf/runestrcmp.c
-9c  runefmtstr.c
+9c  utf/runestrcpy.c
-9c  runeseprint.c
+9c  utf/runestrdup.c
-9c  runesmprint.c
+9c  utf/runestrlen.c
-9c  runesnprint.c
+9c  utf/runestrecpy.c
-9c  runesprint.c
+9c  utf/runestrncat.c
-9c  runevseprint.c
+9c  utf/runestrncmp.c
-9c  runevsmprint.c
+9c  utf/runestrncpy.c
-9c  runevsnprint.c
+9c  utf/runestrrchr.c
-9c  seprint.c
+9c  utf/runestrstr.c
-9c  smprint.c
+9c  utf/runetype.c
-9c  snprint.c
+9c  utf/utfecpy.c
-9c  sprint.c
+9c  utf/utflen.c
-9c  strtod.c
+9c  utf/utfnlen.c
-9c  vfprint.c
+9c  utf/utfrrune.c
-9c  vseprint.c
+9c  utf/utfrune.c
-9c  vsmprint.c
+9c  utf/utfutf.c
-9c  vsnprint.c
+9ar rvc ../../lib/lib9.a dofmt.o errfmt.o fltfmt.o fmt.o fmtfd.o fmtfdflush.o fmtlock.o fmtprint.o fmtquote.o fmtrune.o fmtstr.o fmtvprint.o fprint.o nan64.o print.o runefmtstr.o runeseprint.o runesmprint.o runesnprint.o runesprint.o runevseprint.o runevsmprint.o runevsnprint.o seprint.o smprint.o snprint.o sprint.o strtod.o vfprint.o vseprint.o vsmprint.o vsnprint.o charstod.o pow10.o rune.o runestrcat.o runestrchr.o runestrcmp.o runestrcpy.o runestrdup.o runestrlen.o runestrecpy.o runestrncat.o runestrncmp.o runestrncpy.o runestrrchr.o runestrstr.o runetype.o utfecpy.o utflen.o utfnlen.o utfrrune.o utfrune.o utfutf.o
-9c  charstod.c
-9c  pow10.c
-9ar rvc ../../lib/libfmt.a dofmt.o errfmt.o fltfmt.o fmt.o fmtfd.o fmtfdflush.o fmtlock.o fmtprint.o fmtquote.o fmtrune.o fmtstr.o fmtvprint.o fprint.o nan64.o print.o runefmtstr.o runeseprint.o runesmprint.o runesnprint.o runesprint.o runevseprint.o runevsmprint.o runevsnprint.o seprint.o smprint.o snprint.o sprint.o strtod.o vfprint.o vseprint.o vsmprint.o vsnprint.o charstod.o pow10.o
 cd ..
 cd libbio
 9c  bbuffered.c
@@ -112,6 +109,6 @@ cd cmd/mk
 9c  varsub.c
 9c  word.c
 9c  unix.c
-9l -o o.mk arc.o archive.o bufblock.o env.o file.o graph.o job.o lex.o main.o match.o mk.o parse.o recipe.o rule.o run.o sh.o shprint.o symtab.o var.o varsub.o word.o unix.o -lregexp9 -lbio -lfmt -lutf
+9l -o o.mk arc.o archive.o bufblock.o env.o file.o graph.o job.o lex.o main.o match.o mk.o parse.o recipe.o rule.o run.o sh.o shprint.o symtab.o var.o varsub.o word.o unix.o -lregexp9 -lbio -l9
 install -c o.mk ../../../bin/mk
 cd ..