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
This commit is contained in:
gdr-ftp 1998-02-19 01:00:36 +00:00
parent bb39be07cc
commit 3c8936e8bc
2 changed files with 17 additions and 9 deletions

View File

@ -8,19 +8,24 @@
# directories: # directories:
# gen, gno, locale, stdio, stdlib, stdtime, string, sys # 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. # 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 LIB = c
# assert.a must be copied from $(ORCA_SRC)/ORCALib/obj into $(OBJ_DIR)
OBJS= assert.a # This actually resides in the ORCALib source tree
SRCS = assert.asm
# This library goes into /lib. # This library goes into /lib.
USE_SLASH_LIB= true USE_SLASH_LIB= true
.INCLUDE: /src/gno/lib/lib.mk .INCLUDE: /src/gno/lib/lib.mk
$(LIBTARGET):: lib$(LIB).r # Use cp(1) rather than install(1) here so that we get a newer timestamp.
$(CATREZ) -d $@ $< assert.o: $(ORCA_SRC)/ORCALib/obj/assert.a
cp $< $@

View File

@ -1,24 +1,26 @@
/* /*
* Resources for version and comment * 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 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 "Types.rez"
#include "/src/gno/build.tools/builddate.rez"
/* /*
* Version * Version
*/ */
resource rVersion (1, purgeable3) { resource rVersion (1, purgeable3) {
{ 2, 0, 6, /* Version 2.0.6 */ { 2, 0, 6, /* version */
beta, /* development|alpha|beta|final|release */ beta, /* development|alpha|beta|final|release */
3 }, /* non-final release number */ 3 }, /* non-final release number */
verUS, /* Country */ verUS, /* Country */
LIB, LIB,
PORTED PORTED
BUILD_DATE
}; };
/* /*
@ -27,4 +29,5 @@ resource rVersion (1, purgeable3) {
resource rComment (1, purgeable3) { resource rComment (1, purgeable3) {
LIB "\n" LIB "\n"
PORTED PORTED
BUILD_DATE
}; };