clean up make script

reorder pieces so io is earlier

R=rsc
DELTA=66  (27 added, 24 deleted, 15 changed)
OCL=19248
CL=19255

src/lib/make.bash

@@ -4,49 +4,52 @@
 
 #!/bin/bash
 
-set -e
-
-# Don't sort the files in the for loop - some of the orderings matter.
+function buildfiles() {
 	rm -f *.6
-for i in \
-	strings.go\
-
+	for i
 	do
 		base=$(basename $i .go)
 		echo 6g -o $GOROOT/pkg/$base.6 $i
 		6g -o $GOROOT/pkg/$base.6 $i
 	done
+}
 
-for i in syscall os math reflect fmt
+function builddirs() {
+	for i
 	do
 		echo; echo; echo %%%% making lib/$i %%%%; echo
 		cd $i
 		make install
 		cd ..
 	done
+}
 
-# Don't sort the files in the for loop - some of the orderings matter.
+set -e
 rm -f *.6
-for i in \
-	flag.go\
+
+# Don't sort the elements of the lists - some of the orderings matter.
+
+buildfiles	strings.go
+
+builddirs	syscall \
+		math \
+		os	\
+		reflect \
+	
+buildfiles	io.go
+
+builddirs	fmt
+
+buildfiles	flag.go\
 		container/vector.go\
 		rand.go\
 		sort.go\
-	io.go\
 		bufio.go\
 		once.go\
 		bignum.go\
 	
-do
-	base=$(basename $i .go)
-	echo 6g -o $GOROOT/pkg/$base.6 $i
-	6g -o $GOROOT/pkg/$base.6 $i
-done
+builddirs	net\
+		time\
+		http\
+		regexp\
 
-for i in net time http regexp
-do
-	echo; echo; echo %%%% making lib/$i %%%%; echo
-	cd $i
-	make install
-	cd ..
-done