This is Paul K's latest set of ld changes. A commit was necessary at this

[unix-history] / gnu / usr.bin / ld / rtld / Makefile

diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 1a76c51..0fbf2b2 100644 (file)
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,25 +1,25 @@
-#      $Id: Makefile,v 1.7 1993/12/11 21:05:59 jkh Exp $
+#      $Id: Makefile,v 1.8 1994/01/28 21:01:20 pk Exp $

 
 PROG=  ld.so
 
 PROG=  ld.so

-SRCS=  mdprologue.S sbrk.c rtld.c shlib.c etc.c md.c
+SRCS=  mdprologue.S rtld.c malloc.c shlib.c etc.c md.c

 NOMAN= noman
 LDDIR?= $(.CURDIR)/..
 #PICFLAG=-pic
 PICFLAG=-fpic
 NOMAN= noman
 LDDIR?= $(.CURDIR)/..
 #PICFLAG=-pic
 PICFLAG=-fpic

-CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) -O $(PICFLAG) -DRTLD
-LDFLAGS = -Bshareable -Bsymbolic -assert nosymbolic -Z
-LIBS =  -lc_pic -lgcc_pic
+CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) $(PICFLAG) -DRTLD
+LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
+ASFLAGS+=-k
+LDADD+=        -lc_pic

 BINDIR= /usr/libexec
 BINDIR= /usr/libexec

-ASFLAGS = -k
-
-.PATH: $(LDDIR) $(LDDIR)/$(MACHINE)

 
 .SUFFIXES: .S
 
 
 .SUFFIXES: .S
 

+.PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
+

 $(PROG):
 $(PROG):

-       $(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIBS) $(LDADD)
+       $(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDADD)

 
 .S.o:
 
 .S.o:

-       $(CPP) $(.IMPSRC) | $(AS) $(ASFLAGS) -o $(.TARGET) -
+       ${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>