make Makefiles safe for parallel make

use -j4 (4-way parallel) in make.bash.

halves time for make.bash on r45

also add libregexp, acid to default build

R=r
DELTA=90  (39 added, 37 deleted, 14 changed)
OCL=15485
CL=15487

6 files changed, 18 insertions, 0 deletions

diff --git a/src/lib/make.bash b/src/lib/make.bash
index 6537f0164..5714954fa 100755
--- a/src/lib/make.bash
+++ b/src/lib/make.bash
@@ -4,6 +4,8 @@
 
 #!/bin/bash
 
+set -e
+
 echo; echo; echo %%%% making lib %%%%; echo
 
 for i in os math
diff --git a/src/lib/math/Makefile b/src/lib/math/Makefile
index f1f24263c..f66cc4161 100644
--- a/src/lib/math/Makefile
+++ b/src/lib/math/Makefile
@@ -37,6 +37,11 @@ a3: $(O3)
 a4: $(O4)
 	$(O)ar grc $(PKG) $(O4)
 
+$(O1): nuke
+$(O2): a1
+$(O3): a2
+$(O4): a3
+
 nuke:
 	rm -f *.$(O) *.a $(PKG)
 
diff --git a/src/lib/math/make.bash b/src/lib/math/make.bash
index cdc9a9268..66062b3fa 100644
--- a/src/lib/math/make.bash
+++ b/src/lib/math/make.bash
@@ -4,6 +4,8 @@
 
 #!/bin/bash
 
+set -e
+
 make install
 
 # old way: bash g1 && cp math.a $GOROOT/pkg/math.a
diff --git a/src/lib/net/Makefile b/src/lib/net/Makefile
index 5d0802173..4788e84e1 100644
--- a/src/lib/net/Makefile
+++ b/src/lib/net/Makefile
@@ -22,8 +22,11 @@ $(NET): $(NETO)
 
 $(NETO): $(IP) $(SOCKET)
 
+$(SOCKETO): $(IP)
+
 $(SOCKET): $(SOCKETO)
 	$(O)ar grc $(SOCKET) $(SOCKETO)
+	rm $(SOCKETO)
 
 $(GOROOT)/pkg/%.$O: %.$O
 	cp $*.$O $(GOROOT)/pkg/$*.$O
diff --git a/src/lib/os/Makefile b/src/lib/os/Makefile
index 16b803031..130f62c86 100644
--- a/src/lib/os/Makefile
+++ b/src/lib/os/Makefile
@@ -23,6 +23,9 @@ a1: 	$(O1)
 a2: 	$(O2)
 	$(O)ar grc $(PKG) $(O2)
 
+$(O1): nuke
+$(O2): a1
+
 nuke:
 	rm -f *.$(O) *.a $(PKG)
 
diff --git a/src/lib/time/Makefile b/src/lib/time/Makefile
index f0a6f132e..d397be1f3 100644
--- a/src/lib/time/Makefile
+++ b/src/lib/time/Makefile
@@ -22,6 +22,9 @@ a1: 	$(O1)
 a2: 	$(O2)
 	$(O)ar grc $(PKG) $(O2)
 
+$(O1): nuke
+$(O2): a1
+
 nuke:
 	rm -f *.$(O) *.a $(PKG)