From 3c8936e8bc1daac883c29872031ee41299ac80c8 Mon Sep 17 00:00:00 2001 From: gdr-ftp Date: Thu, 19 Feb 1998 01:00:36 +0000 Subject: [PATCH] Makefile: - eliminate double concatenation of resource fork - specify files via SRCS vice OBJS - obtain the assert object file from where it is built in the ORCA hierarchy libc.rez: - add build date to displayed data --- lib/libc/Makefile | 17 +++++++++++------ lib/libc/libc.rez | 9 ++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index bf8a399..5748d9d 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -8,19 +8,24 @@ # directories: # gen, gno, locale, stdio, stdlib, stdtime, string, sys # +# Before 'make' is run in this directory, you must also build ORCALib, +# since we steal some of our object files from that hierarchy. +# # Devin Reade, 1997. # -# $Id: Makefile,v 1.8 1998/02/09 08:44:06 taubert Exp $ +# $Id: Makefile,v 1.9 1998/02/19 01:00:34 gdr-ftp Exp $ # -LIB= c -# assert.a must be copied from $(ORCA_SRC)/ORCALib/obj into $(OBJ_DIR) -OBJS= assert.a +LIB = c + +# This actually resides in the ORCALib source tree +SRCS = assert.asm # This library goes into /lib. USE_SLASH_LIB= true .INCLUDE: /src/gno/lib/lib.mk -$(LIBTARGET):: lib$(LIB).r - $(CATREZ) -d $@ $< +# Use cp(1) rather than install(1) here so that we get a newer timestamp. +assert.o: $(ORCA_SRC)/ORCALib/obj/assert.a + cp $< $@ diff --git a/lib/libc/libc.rez b/lib/libc/libc.rez index 52cc984..a54f3f7 100755 --- a/lib/libc/libc.rez +++ b/lib/libc/libc.rez @@ -1,24 +1,26 @@ /* * Resources for version and comment * - * $Id: libc.rez,v 1.1 1998/02/08 03:47:25 gdr-ftp Exp $ + * $Id: libc.rez,v 1.2 1998/02/19 01:00:36 gdr-ftp Exp $ */ #define LIB "libc for GNO" -#define PORTED "Ported from 4.4BSD and other sources by Devin Reade." +#define PORTED "Ported from 4.4BSD and other sources by Devin Reade.\n" #include "Types.rez" +#include "/src/gno/build.tools/builddate.rez" /* * Version */ resource rVersion (1, purgeable3) { - { 2, 0, 6, /* Version 2.0.6 */ + { 2, 0, 6, /* version */ beta, /* development|alpha|beta|final|release */ 3 }, /* non-final release number */ verUS, /* Country */ LIB, PORTED + BUILD_DATE }; /* @@ -27,4 +29,5 @@ resource rVersion (1, purgeable3) { resource rComment (1, purgeable3) { LIB "\n" PORTED + BUILD_DATE };