Makefile:

- 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)
This commit is contained in:
gdr-ftp 1998-02-19 01:07:56 +00:00
parent 7e3c77c4a2
commit 79cc150685
7 changed files with 95 additions and 86 deletions

View File

@ -1,17 +1,18 @@
#
# Makefile for libc/gen.
#
# $Id: Makefile,v 1.8 1998/02/09 08:44:12 taubert Exp $
# $Id: Makefile,v 1.9 1998/02/19 01:07:21 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJ_ASM=setjmp.o syslog.o
OBJ_C= basename.o bmem.o compat.o dirent.o err.o fnmatch.o fts.o \
getcwd.o getgrent.o getpass.o getpwent.o getttyent.o hostname.o \
oldlog.o popen.o psignal.o pwcache.o scandir.o siglist.o sleep.o \
tty.o utime.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRC_ASM = setjmp.asm syslog.asm
SRC_C = basename.c bmem.c compat.c dirent.c err.c fnmatch.c fts.c \
getcwd.c getgrent.c getpass.c getpwent.c getttyent.c hostname.c \
oldlog.c popen.c psignal.c pwcache.c scandir.c siglist.c sleep.c \
tty.c uname.c utime.c
OBJS= $(OBJ_ASM) $(OBJ_C)
SRCS = $(SRC_ASM) $(SRC_C)
.INCLUDE: /src/gno/lib/lib.mk

View File

@ -1,11 +1,12 @@
#
# gno/lib/libc/locale/Makefile
#
# $Id: Makefile,v 1.5 1998/02/09 08:44:28 taubert Exp $
# $Id: Makefile,v 1.6 1998/02/19 01:07:24 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJS= table.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRCS = table.c
.INCLUDE: /src/gno/lib/lib.mk

View File

@ -1,10 +1,11 @@
#
# $Id: Makefile,v 1.3 1998/02/09 08:44:37 taubert Exp $
# $Id: Makefile,v 1.4 1998/02/19 01:07:27 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJS= regcomp.o regerror.o regexec.o regfree.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRCS = regcomp.c regerror.c regexec.c regfree.c
# I've not bothered to determine what POSIX_MISTAKE means, but 4.4BSD
# uses it.
@ -12,7 +13,7 @@ CFLAGS += -v -r -DPOSIX_MISTAKE
.INCLUDE: /src/gno/lib/lib.mk
regcomp.o:: cclass.h cname.h regex2.h utils.h
regerror.o:: utils.h
regexec.o:: engine.c regex2.h utils.h
regfree.o:: regex2.h utils.h
regcomp.o: cclass.h cname.h regex2.h utils.h
regerror.o: utils.h
regexec.o: engine.c regex2.h utils.h
regfree.o: regex2.h utils.h

View File

@ -1,21 +1,24 @@
#
# gno/lib/libc/stdio/Makefile
#
# $Id: Makefile,v 1.10 1998/02/09 08:44:46 taubert Exp $
# $Id: Makefile,v 1.11 1998/02/19 01:07:33 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJS= clrerr.o fclose.o fdopen.o feof.o ferror.o fflush.o fgetc.o \
fgetln.o fgetpos.o fgets.o fileno.o findfp.o flags.o fopen.o \
fprintf.o fpurge.o fputc.o fputs.o fread.o freopen.o fscanf.o \
fseek.o fsetpos.o ftell.o funopen.o fvwrite.o fwalk.o fwrite.o \
getc.o getchar.o gets.o getw.o makebuf.o mktemp.o perror.o printf.o \
putc.o putchar.o puts.o putw.o refill.o remove.o rewind.o rget.o \
scanf.o setbuf.o setbuffer.o setvbuf.o snprintf.o sprintf.o sscanf.o \
stdio.o tempnam.o tmpfile.o tmpnam.o ungetc.o vfscanf.o \
vprintf.o vscanf.o vsnprintf.o vsprintf.o vsscanf.o wbuf.o wsetup.o \
vfprintf1.o vfprintf2.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRCS = clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \
fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \
fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
fseek.c fsetpos.c ftell.c funopen.c fvwrite.c fwalk.c fwrite.c \
getc.c getchar.c gets.c getw.c makebuf.c mktemp.c perror.c printf.c \
putc.c putchar.c puts.c putw.c refill.c remove.c rewind.c rget.c \
scanf.c setbuf.c setbuffer.c setvbuf.c snprintf.c sprintf.c sscanf.c \
stdio.c tempnam.c tmpfile.c tmpnam.c ungetc.c vfscanf.c \
vprintf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c wbuf.c wsetup.c \
vfprintf1.c vfprintf2.c
.INCLUDE: /src/gno/lib/lib.mk
#
# There is a problem with ORCA/C v2.1.1b2 (and likely earlier versions)
@ -30,49 +33,49 @@ OBJS= clrerr.o fclose.o fdopen.o feof.o ferror.o fflush.o fgetc.o \
JINCL = -I/usr/include -I/lang/orca/libraries/orcacdefs
JDEFS = -D__ORCAC__ -D__appleiigs__ -D__GNO__ -DSPLIT_FILE_2
.INCLUDE: /src/gno/lib/lib.mk
junk: $(OBJ_DIR) $(OBJ_DIR)junk.c
junk.c: vfprintf.c
gsh -c ${mktmp cpp $(JINCL) $(JDEFS) $< > 14/junk.c; $(CP) 14/junk.c $@}
$(OBJ_DIR)junk.c: vfprintf.c
gsh -c ${mktmp cpp $(JINCL) $(JDEFS) $< > $@}
vfprintf1.o: vfprintf.c
$(CC) -c -o $@ $(CFLAGS) -DSPLIT_FILE_1 $<
vfprintf2.o: junk.c
vfprintf2.o: $(OBJ_DIR)junk.c
$(CC) -c -o $@ $(CFLAGS) -DSPLIT_FILE_2 $<
# Additional dependancies:
fclose.o:: local.h
fdopen.o:: local.h
fflush.o:: local.h
fgetln.o:: local.h
fgets.o:: local.h
findfp.o:: local.h glue.h
fopen.o:: local.h
fpurge.o:: local.h
fputs.o:: fvwrite.h
fread.o:: local.h
freopen.o:: local.h
fseek.o:: local.h
ftell.o:: local.h
funopen.o:: local.h
fvwrite.o:: local.h fvwrite.h
fwalk.o:: local.h glue.h
fwrite.o:: local.h fvwrite.h
makebuf.o:: local.h
puts.o:: fvwrite.h
putw.o:: fvwrite.h
refill.o:: local.h
rget.o:: local.h
setbuf.o:: local.h
setvbuf.o:: local.h
sprintf.o:: local.h
sscanf.o:: local.h
stdio.o:: local.h
ungetc.o:: local.h
vfprintf.o:: local.h fvwrite.h floatio.h
vfprintf1.o:: local.h fvwrite.h floatio.h
vfprintf2.o:: local.h fvwrite.h floatio.h
vfscanf.o:: local.h floatio.h
wbuf.o:: local.h
wsetup.o:: local.h
fclose.o: local.h
fdopen.o: local.h
fflush.o: local.h
fgetln.o: local.h
fgets.o: local.h
findfp.o: local.h glue.h
fopen.o: local.h
fpurge.o: local.h
fputs.o: fvwrite.h
fread.o: local.h
freopen.o: local.h
fseek.o: local.h
ftell.o: local.h
funopen.o: local.h
fvwrite.o: local.h fvwrite.h
fwalk.o: local.h glue.h
fwrite.o: local.h fvwrite.h
makebuf.o: local.h
puts.o: fvwrite.h
putw.o: fvwrite.h
refill.o: local.h
rget.o: local.h
setbuf.o: local.h
setvbuf.o: local.h
sprintf.o: local.h
sscanf.o: local.h
stdio.o: local.h
ungetc.o: local.h
vfprintf.o: local.h fvwrite.h floatio.h
vfprintf1.o: local.h fvwrite.h floatio.h
vfprintf2.o: local.h fvwrite.h floatio.h
vfscanf.o: local.h floatio.h
wbuf.o: local.h
wsetup.o: local.h

View File

@ -1,13 +1,14 @@
#
# gno/lib/libc/stdlib/Makefile
#
# $Id: Makefile,v 1.5 1998/02/09 08:44:55 taubert Exp $
# $Id: Makefile,v 1.6 1998/02/19 01:07:39 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJS= cvt.o environ.o fpspecnum.o getopt.o getsubopt.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRCS = cvt.c environ.c fpspecnum.asm getopt.c getsubopt.c
.INCLUDE: /src/gno/lib/lib.mk
fpspecnum.o:: fpspecnum.mac
fpspecnum.o: fpspecnum.mac

View File

@ -1,11 +1,12 @@
#
# gno/lib/libc/string/Makefile
#
# $Id: Makefile,v 1.5 1998/02/09 08:45:13 taubert Exp $
# $Id: Makefile,v 1.6 1998/02/19 01:07:47 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJS= case.o str.o strerror.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRCS = case.c str.c strerror.c
.INCLUDE: /src/gno/lib/lib.mk

View File

@ -1,13 +1,14 @@
#
# gno/lib/libc/sys/Makefile
#
# $Id: Makefile,v 1.5 1998/02/09 08:45:21 taubert Exp $
# $Id: Makefile,v 1.6 1998/02/19 01:07:56 gdr-ftp Exp $
#
LIB= c
LIBPFX= $(OBJ_DIR)../
OBJS= exec.o syscall.o trap.o
LIB = c
LIBPFX = $(OBJ_DIR)../
NO_REZ = true
SRCS = exec.c syscall.c trap.asm
.INCLUDE: /src/gno/lib/lib.mk
trap.o:: trap.mac
trap.o: trap.mac