From 7e3c77c4a2f66dcebe187ec0287e1981b2b8a64a Mon Sep 17 00:00:00 2001
From: gdr-ftp <gdr-ftp>
Date: Thu, 19 Feb 1998 01:05:17 +0000
Subject: [PATCH] Makefile, stack.asm: 	- move generated macro file to /obj
 hierarchy Makefile: 	- fix location of (non-generated) macro sources 
 - specify files via SRCS vice OBJS.  This eliminates an extraneous 	  ".o"
 in the final OBJS value. 	- don't attempt to attach a rez fork (leave it
 for the upper 	  level makefile)

---
 lib/libc/gno/Makefile  | 31 +++++++++++++++----------------
 lib/libc/gno/stack.asm |  4 ++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/lib/libc/gno/Makefile b/lib/libc/gno/Makefile
index fcbb743..a0c4cc9 100644
--- a/lib/libc/gno/Makefile
+++ b/lib/libc/gno/Makefile
@@ -1,26 +1,25 @@
 #
 # gno/libc/gno/Makefile
 #
-# $Id: Makefile,v 1.6 1998/02/09 08:44:20 taubert Exp $
+# $Id: Makefile,v 1.7 1998/02/19 01:05:16 gdr-ftp Exp $
 #
 
-LIB=	c
-LIBPFX=	$(OBJ_DIR)../
-OBJ_ASM=gnocmd.o parsearg.o stack.o
-OBJ_C=	gnomisc.o gsstring.o map.o stack2.o
-OBJS=	$(OBJ_ASM) $(OBJ_C)
-
-MACROS_ORCA	= $(ORCA_DIST)/OrcaInclude
-MACRO_FILES	= $(MACROS_ORCA)/m16.tools $(MACROS_ORCA)/m16.orca
+LIB	= c
+LIBPFX	= $(OBJ_DIR)../
+NO_REZ	= true
+SRC_ASM	= gnocmd.asm parsearg.asm stack.asm
+SRC_C	= gnomisc.c gsstring.c map.c stack2.c
+SRCS	= $(SRC_ASM) $(SRC_C)
 
 .INCLUDE: /src/gno/lib/lib.mk
 
-stack.mac:
+MACROS_ORCA	= $(ORCA_DIST)/libraries/ORCAInclude
+MACRO_FILES	= $(MACROS_ORCA)/m16.tools $(MACROS_ORCA)/m16.orca
+MAC		= $(OBJ_DIR)stack.mac
+
+$(MAC):
 	macgen -p stack.asm $@ $(MACRO_FILES)
 
-clean clobber:
-	$(RM) -f $(OBJS) stack.mac
-
-gnocmd.o::	gnocmd.mac
-parsearg.o::	parsearg.mac
-stack.o::	stack.mac
+gnocmd.o:	gnocmd.mac
+parsearg.o:	parsearg.mac
+stack.o:	$(MAC)
diff --git a/lib/libc/gno/stack.asm b/lib/libc/gno/stack.asm
index 10d8e50..08bf12b 100644
--- a/lib/libc/gno/stack.asm
+++ b/lib/libc/gno/stack.asm
@@ -2,12 +2,12 @@
 ; Stack checking routines by Phillip Vandry <vandry@cam.org>.  Added
 ; to GNO by Devin Reade <gdr@myrias.com>.  See the man page for details.
 ;
-; $Id: stack.asm,v 1.2 1997/12/21 20:11:17 gdr Exp $
+; $Id: stack.asm,v 1.3 1998/02/19 01:05:17 gdr-ftp Exp $
 ;
 
 	keep	stack
 
-	mcopy	stack.mac
+	mcopy	:obj:gno:lib:libc:gno:stack.mac
 	case	on
 
 * This test function goes into "stack.ROOT", which is not used