From 0ce301a14ac537ebffe892062c077173d4c20069 Mon Sep 17 00:00:00 2001
From: gdr-ftp <gdr-ftp>
Date: Fri, 19 Mar 1999 07:15:03 +0000
Subject: [PATCH] Makefile: 	- link with *.o rather than *.root to avoid
 problems on netatalk- 	  served source partitions.  affected err.root
 box.root, regexp.root 	- create linkmap for debugging purposes 	-
 added install and release targets err.asm, regexp.asm 	- added dummy routine
 so that we can throw away the *.root file.

---
 kern/gno/Makefile   | 28 ++++++++++++++++++++++------
 kern/gno/err.asm    |  5 ++++-
 kern/gno/regexp.asm |  5 ++++-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/kern/gno/Makefile b/kern/gno/Makefile
index a35bab7..334e9cd 100644
--- a/kern/gno/Makefile
+++ b/kern/gno/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/02/09 08:43:55 taubert Exp $
+#	$Id: Makefile,v 1.3 1999/03/19 07:15:03 gdr-ftp Exp $
 
 .INCLUDE: /src/gno/paths.mk
 
@@ -6,19 +6,35 @@ PROG=	kern
 OBJS=	main.o patch.o kern.o sys.o signal.o ctool.o sem.o \
 	queue.o data.o diag.o resource.o tty.o select.o gsos.o \
 	p16.o pipe.o shellcall.o fastfile.o texttool.o driver.o \
-	util.o var.o ep.o err.root regexp.root stat.o ports.o \
+	util.o var.o ep.o err.o regexp.o stat.o ports.o \
 	sleep.o pty.o net.o \
-	inout.o console.o box.root conpatch.o
+	inout.o console.o box.o conpatch.o
 CFLAGS+=-DKERNEL
+
+LDFLAGS += -M
+
 .SOURCE: ../drivers
 
+build:	$(OBJ_DIR) $(OBJ_DIR)$(PROG)
+
+$(OBJ_DIR):
+	install -d $(OBJ_DIR)
+
 $(OBJ_DIR)$(PROG): $(OBJS)
-	gsh -c ${mktmp prefix 13 /lang/orca/libraries; $(LD) $(LDFLAGS) -o $@ $<}
-	compile +w $(PROG).rez keep=$@
+	gsh -c ${mktmp prefix 13 /lang/orca/libraries; $(LD) $(LDFLAGS) -o $@ $< > $(OBJ_DIR)$(PROG).linkmap}
+	install $(PROG).rez $(TMPDIR)
+	compile +w $(TMPDIR)/$(PROG).rez keep=$@
+	$(RM) -f $(TMPDIR)/$(PROG).rez
 	chtyp -t s16 $@
-	$(CP) $@ /ren/gno.new/kern.new
+#	$(CP) $@ /ren/gno.new/kern.new
 $(OBJ_DIR)$(PROG): $(PROG).rez
 
+release:	$(OBJ_DIR)$(PROG)
+	install $(OBJ_DIR)$(PROG) $(OBJ_DIR)$(PROG).linkmap $(RELEASE_DIR)
+
+install:
+	@echo You cannot install the kernel into a live system.  Target ignored.
+
 #%.o : %.c
 #	$(CC) $(CFLAGS) -c $< -o $@
 #	@gsh -c ${mktmp cd $(OBJ_DIR); nameobj -p $@}
diff --git a/kern/gno/err.asm b/kern/gno/err.asm
index b8cb5bb..6ee85b7 100644
--- a/kern/gno/err.asm
+++ b/kern/gno/err.asm
@@ -1,4 +1,4 @@
-*	$Id: err.asm,v 1.1 1998/02/02 08:19:20 taubert Exp $
+*	$Id: err.asm,v 1.2 1999/03/19 07:15:03 gdr-ftp Exp $
 **************************************************************************
 *
 * The GNO Shell Project
@@ -25,6 +25,9 @@
 	mcopy m/err.mac
 	case	on
 
+dummyErr start			; ends up in .root and ignored
+	end
+
 printError	START KERN2
 
 	proc
diff --git a/kern/gno/regexp.asm b/kern/gno/regexp.asm
index 52cd951..4c54bfe 100644
--- a/kern/gno/regexp.asm
+++ b/kern/gno/regexp.asm
@@ -1,4 +1,4 @@
-*	$Id: regexp.asm,v 1.1 1998/02/02 08:19:42 taubert Exp $
+*	$Id: regexp.asm,v 1.2 1999/03/19 07:15:03 gdr-ftp Exp $
 **************************************************************************
 *
 * The GNO Shell Project
@@ -66,6 +66,9 @@
 	mcopy m/regexp.mac
 	case	on
 
+dummyRegExp start		; ends up in .root and ignored
+	end
+
 RegExp	START
 
 result	equ   0