From a0858c04e4a8bb71756c160041f36a39ccfdf450 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 18 Sep 1991 10:02:37 +0000
Subject: [PATCH] Many fixes

---
 mach/proto/libg/proto.libbc  | 4 +++-
 mach/proto/libg/proto.libcc  | 3 ++-
 mach/proto/libg/proto.libem  | 3 ++-
 mach/proto/libg/proto.libend | 9 ++++++---
 mach/proto/libg/proto.libm2  | 3 ++-
 mach/proto/libg/proto.libmon | 5 +++--
 mach/proto/libg/proto.liboc  | 3 ++-
 mach/proto/libg/proto.libpc  | 3 ++-
 mach/proto/libg/proto.libsys | 7 ++++---
 mach/proto/libg/proto.make   | 8 ++++----
 mach/proto/libg/proto.sysmon | 3 ++-
 11 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/mach/proto/libg/proto.libbc b/mach/proto/libg/proto.libbc
index f4485bcde..3fb4e28df 100644
--- a/mach/proto/libg/proto.libbc
+++ b/mach/proto/libg/proto.libbc
@@ -6,6 +6,7 @@
 
 MACHDEF= \
 	"MACH=$(MACH)" \
+	"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
 	"SUF=$(SUF)" \
 	"ASAR=$(ASAR)" \
 	"RANLIB=$(RANLIB)" \
@@ -13,7 +14,8 @@ MACHDEF= \
 	"TARGET_HOME=$(TARGET_HOME)" \
 	"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MAKEFILE=../../proto/libg/Makefile
+
 LIBBC="PREF=bc" "SRC=lang/basic/lib"
 
 all:		libbc
diff --git a/mach/proto/libg/proto.libcc b/mach/proto/libg/proto.libcc
index f0809fa9a..4a7a85099 100644
--- a/mach/proto/libg/proto.libcc
+++ b/mach/proto/libg/proto.libcc
@@ -6,6 +6,7 @@
 
 MACHDEF= \
 	"MACH=$(MACH)" \
+	"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
 	"SUF=$(SUF)" \
 	"ASAR=$(ASAR)" \
 	"RANLIB=$(RANLIB)" \
@@ -13,7 +14,7 @@ MACHDEF= \
 	"TARGET_HOME=$(TARGET_HOME)" \
 	"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MAKEFILE=../../proto/libg/Makefile
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 LIBM="PREF=m" "SRC=lang/cem/libcc/math"
diff --git a/mach/proto/libg/proto.libem b/mach/proto/libg/proto.libem
index d078fff8a..8481628bb 100644
--- a/mach/proto/libg/proto.libem
+++ b/mach/proto/libg/proto.libem
@@ -12,7 +12,8 @@ libem_o.a:	$(SRC_DIR)/libem_s.a
 		ASAR="$(ASAR)" ; export ASAR ; \
 		RANLIB="$(RANLIB)" ; export RANLIB ; \
 		MACH="$(MACH)" ; export MACH ; \
-		MACHFL="$(MACHFL)" ; export MACHFL ; \
+		SUF="$(SUF)" ; export SUF ; \
+		MACHFL="$(MACHFL) -I$(TARGET_HOME)/h" ; export MACHFL ; \
 		if [ $(SUF) = o ] ; then march $(SRC_DIR) libem_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libem_s.a libem_o.a ; fi
 
 install:	all
diff --git a/mach/proto/libg/proto.libend b/mach/proto/libg/proto.libend
index 254035fe6..efdb93516 100644
--- a/mach/proto/libg/proto.libend
+++ b/mach/proto/libg/proto.libend
@@ -8,12 +8,14 @@ SRC_DIR =	$(SRC_HOME)/mach/$(MACH)/libend
 
 all:		end_o.a
 
-end_o.a:	$(SRC_DIR)/end_s.a
+end_o.a:
 		ASAR="$(ASAR)" ; export ASAR ; \
 		RANLIB="$(RANLIB)" ; export RANLIB ; \
 		MACH="$(MACH)" ; export MACH ; \
+		SUF="$(SUF)" ; export SUF ; \
 		MACHFL="$(MACHFL)" ; export MACHFL ; \
-		if [ $(SUF) = o ] march $(SRC_DIR) end_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/end_s.a end_o.a ; fi
+		LIB=`head -1 $(SRC_DIR)/LIST` ; export LIB ; \
+		if [ $(SUF) = o -o $(SUF) = m ] ; then march $(SRC_DIR) end_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/$$LIB end_o.a ; fi
 
 install:	all
 		cp end_o.a $(TARGET_HOME)/lib/$(MACH)/end_em
@@ -29,4 +31,5 @@ opr:
 		make pr | opr
 
 pr:
-		arch pv $(SRC_DIR)/end_s.a | pr -h $(SRC_DIR)/end_s.a
+		LIB=`head -1 $(SRC_DIR)/LIST` ; export LIB ; \
+		arch pv $(SRC_DIR)/$$LIB | pr -h $(SRC_DIR)/$$LIB
diff --git a/mach/proto/libg/proto.libm2 b/mach/proto/libg/proto.libm2
index a5e8f3208..20755960c 100644
--- a/mach/proto/libg/proto.libm2
+++ b/mach/proto/libg/proto.libm2
@@ -6,6 +6,7 @@
 
 MACHDEF= \
 	"MACH=$(MACH)" \
+	"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
 	"SUF=$(SUF)" \
 	"ASAR=$(ASAR)" \
 	"RANLIB=$(RANLIB)" \
@@ -13,7 +14,7 @@ MACHDEF= \
 	"TARGET_HOME=$(TARGET_HOME)" \
 	"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MAKEFILE=../../proto/libg/Makefile
 LIBM2="PREF=m2" "SRC=lang/m2/libm2"
 
 all:		libm2
diff --git a/mach/proto/libg/proto.libmon b/mach/proto/libg/proto.libmon
index b720b1bc2..6cf44a27f 100644
--- a/mach/proto/libg/proto.libmon
+++ b/mach/proto/libg/proto.libmon
@@ -12,11 +12,12 @@ libmon:		$(SRC_DIR)/libmon_s.a
 		ASAR="$(ASAR)" ; export ASAR ; \
 		RANLIB="$(RANLIB)" ; export RANLIB ; \
 		MACH="$(MACH)" ; export MACH ; \
+		SUF="$(SUF)" ; export SUF ; \
 		MACHFL="$(MACHFL)" ; export MACHFL ; \
-		if [ $(SUF) = o ] march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
+		if [ $(SUF) = o ] ; then march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
 
 head:		$(SRC_DIR)/head_em.s
-		$(MACH) $(MACHFL) $(SRC_DIR)/head_em.s
+		if [ $(SUF) = o ] ; then $(MACH) -c $(MACHFL) $(SRC_DIR)/head_em.s ; else cp $(SRC_DIR)/head_em.s head_em.s ; fi
 		mv head_em.$(SUF) head
 
 install:	all
diff --git a/mach/proto/libg/proto.liboc b/mach/proto/libg/proto.liboc
index 045b92860..780a64dc3 100644
--- a/mach/proto/libg/proto.liboc
+++ b/mach/proto/libg/proto.liboc
@@ -6,6 +6,7 @@
 
 MACHDEF= \
 	"MACH=$(MACH)" \
+	"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
 	"SUF=$(SUF)" \
 	"ASAR=$(ASAR)" \
 	"RANLIB=$(RANLIB)" \
@@ -13,7 +14,7 @@ MACHDEF= \
 	"TARGET_HOME=$(TARGET_HOME)" \
 	"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MAKEFILE=../../proto/libg/Makefile
 LIBOC="PREF=ocm" "SRC=lang/occam/lib"
 
 all:		liboc
diff --git a/mach/proto/libg/proto.libpc b/mach/proto/libg/proto.libpc
index 678043a44..6a5156f73 100644
--- a/mach/proto/libg/proto.libpc
+++ b/mach/proto/libg/proto.libpc
@@ -6,6 +6,7 @@
 
 MACHDEF= \
 	"MACH=$(MACH)" \
+	"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
 	"SUF=$(SUF)" \
 	"ASAR=$(ASAR)" \
 	"RANLIB=$(RANLIB)" \
@@ -13,7 +14,7 @@ MACHDEF= \
 	"TARGET_HOME=$(TARGET_HOME)" \
 	"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MAKEFILE=../../proto/libg/Makefile
 LIBPC="PREF=pc" "SRC=lang/pc/libpc"
 
 all:		libpc
diff --git a/mach/proto/libg/proto.libsys b/mach/proto/libg/proto.libsys
index 24b240145..b8b8f2b69 100644
--- a/mach/proto/libg/proto.libsys
+++ b/mach/proto/libg/proto.libsys
@@ -12,11 +12,12 @@ libmon:		$(SRC_DIR)/libmon_s.a
 		ASAR="$(ASAR)" ; export ASAR ; \
 		RANLIB="$(RANLIB)" ; export RANLIB ; \
 		MACH="$(MACH)" ; export MACH ; \
-		MACHFL="$(MACHFL)" ; export MACHFL ; \
-		if [ $(SUF) = o ] march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
+		SUF="$(SUF)" ; export SUF ; \
+		MACHFL="$(MACHFL) -I$(SRC_DIR) -I$(TARGET_HOME)/h" ; export MACHFL ; \
+		if [ $(SUF) = o ] ; then march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
 
 head:		$(SRC_DIR)/head_em.s
-		$(MACH) $(MACHFL) $(SRC_DIR)/head_em.s
+		if [ $(SUF) = o ] ; then $(MACH) -c $(MACHFL) -I$(SRC_DIR) -I$(TARGET_HOME)/h $(SRC_DIR)/head_em.s ; else cp $(SRC_DIR)/head_em.s head_em.s ; fi
 		mv head_em.$(SUF) head
 
 install:	all
diff --git a/mach/proto/libg/proto.make b/mach/proto/libg/proto.make
index 6a8ce9f00..46f9856b7 100644
--- a/mach/proto/libg/proto.make
+++ b/mach/proto/libg/proto.make
@@ -25,21 +25,21 @@ headcp: head
 	rm -f head_$(PREF)
 
 tailcp: tail
-	cp tail_$(PREF) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF)
-	$(RANLIB) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF)
+	cp tail_$(PREF)$(SUB) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF)$(SUB)
+	$(RANLIB) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF)$(SUB)
 	rm -f tail_$(PREF)$(SUB)
 
 cp:     headcp tailcp
 
 head_$(PREF):  $(HEADSRC)
 	cp $(HEADSRC) head_$(PREF).e
-	$(MACH) $(MACHFL) -I$(TARGET_HOME)/h head_$(PREF).e
+	$(MACH) $(MACHFL) -c -I$(TARGET_HOME)/h head_$(PREF).e
 	mv head_$(PREF).$(SUF) head_$(PREF)
 	-rm -f head_$(PREF).[ekm$(SUF)]
 
 tail_$(PREF)$(SUB):
 	@echo translation test
-	@$(MACH) $(MACHFL) $(SRC_HOME)/mach/proto/libg/barrier.c
+	@$(MACH) $(MACHFL) -c $(SRC_HOME)/mach/proto/libg/barrier.c
 	@-rm -f barrier.[oeskm] barrier.so
 	@echo OK
 	-rm -f tail_$(PREF)$(SUB)
diff --git a/mach/proto/libg/proto.sysmon b/mach/proto/libg/proto.sysmon
index 42d13dbd3..f96359ed4 100644
--- a/mach/proto/libg/proto.sysmon
+++ b/mach/proto/libg/proto.sysmon
@@ -6,6 +6,7 @@
 
 MACHDEF= \
 	"MACH=$(MACH)" \
+	"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
 	"SUF=$(SUF)" \
 	"ASAR=$(ASAR)" \
 	"RANLIB=$(RANLIB)" \
@@ -13,7 +14,7 @@ MACHDEF= \
 	"TARGET_HOME=$(TARGET_HOME)" \
 	"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MAKEFILE=../../proto/libg/Makefile
 MON="PREF=mon" "SUB=" "SRC=lang/cem/libcc/mon"
 
 all:		mon
-- 
2.34.1