Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.74 retrieving revision 1.80 diff -u -p -r1.74 -r1.80 --- src/share/mk/bsd.lib.mk 1996/11/05 05:40:28 1.74 +++ src/share/mk/bsd.lib.mk 1996/12/29 19:14:32 1.80 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.74 1996/11/05 05:40:28 mikel Exp $ +# $NetBSD: bsd.lib.mk,v 1.80 1996/12/29 19:14:32 christos Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 .if exists(${.CURDIR}/../Makefile.inc) @@ -20,19 +20,19 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio .SUFFIXES: .out .o .po .so .S .s .c .cc .C .f .y .l .ln .m4 .c.o: - @echo "${COMPILE.c} ${.IMPSRC}" + @echo ${COMPILE.c:Q} ${.IMPSRC} @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .c.po: - @echo "${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}" + @echo ${COMPILE.c:Q} -pg ${.IMPSRC} -o ${.TARGET} @${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .c.so: - @echo "${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}" + @echo ${COMPILE.c:Q} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET} @${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o @@ -41,37 +41,37 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i ${.IMPSRC} .cc.o .C.o: - @echo "${COMPILE.cc} ${.IMPSRC}" + @echo ${COMPILE.cc:Q} ${.IMPSRC} @${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .cc.po .C.po: - @echo "${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}" + @echo ${COMPILE.cc:Q} -pg ${.IMPSRC} -o ${.TARGET} @${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .cc.so .C.so: - @echo "${COMPILE.cc} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}" + @echo ${COMPILE.cc:Q} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET} @${COMPILE.cc} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.o .s.o: - @echo "${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}" + @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.po .s.po: - @echo "${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o + @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} + @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.so .s.so: - @echo "${COMPILE.S} ${PICFLAG} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}" + @echo ${COMPILE.S:Q} ${PICFLAG} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} @${COMPILE.S} ${PICFLAG} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o @@ -130,11 +130,12 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO .else $(LD) -shared -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -soname lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - --whole-archive lib${LIB}_pic.a --no-whole-archive ${LDADD} + /usr/lib/crtbegin.o \ + --whole-archive lib${LIB}_pic.a --no-whole-archive ${LDADD} \ + /usr/lib/crtend.o .endif LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} -# the following looks XXX to me... -- cgd LLIBS?= -lc llib-l${LIB}.ln: ${LOBJS} @echo building llib-l${LIB}.ln @@ -155,7 +156,7 @@ cleandir: _SUBDIRUSE clean .if defined(SRCS) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ - sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so:/' \ + sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so \1.ln:/' \ < .depend > $$TMP; \ mv $$TMP .depend) .endif