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.26 retrieving revision 1.70 diff -u -p -r1.26 -r1.70 --- src/share/mk/bsd.lib.mk 1993/08/16 01:41:01 1.26 +++ src/share/mk/bsd.lib.mk 1996/09/23 18:15:48 1.70 @@ -1,47 +1,84 @@ -# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.26 1993/08/16 01:41:01 mycroft Exp $ +# $NetBSD: bsd.lib.mk,v 1.70 1996/09/23 18:15:48 jtc Exp $ +# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.include # for 'NOPIC' definition + +.if exists(${.CURDIR}/shlib_version) +SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major +SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor +.endif + .MAIN: all -# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries +# prefer .S to a .c, add .po, remove stuff not used in the BSD libraries. +# .so used for PIC object files. .ln used for lint output files. .SUFFIXES: -.SUFFIXES: .out .o .po .s .c .cc .C .f .y .l .0 .1 .2 .3 .4 .5 .6 .7 .8 +.SUFFIXES: .out .o .po .so .S .s .c .cc .C .f .y .l .ln .m4 .c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} - @${LD} -x -r ${.TARGET} - @mv a.out ${.TARGET} + @echo "${COMPILE.c} ${.IMPSRC}" + @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o .c.po: - ${CC} -p ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -X -r ${.TARGET} - @mv a.out ${.TARGET} + @echo "${COMPILE.c} -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}" + @${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o + +.c.ln: + ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i ${.IMPSRC} .cc.o .C.o: - ${CXX} ${CXXFLAGS} -c ${.IMPSRC} - @${LD} -x -r ${.TARGET} - @mv a.out ${.TARGET} + @echo "${COMPILE.cc} ${.IMPSRC}" + @${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o .cc.po .C.po: - ${CXX} -p ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -X -r ${.TARGET} - @mv a.out ${.TARGET} - -.s.o: - ${CPP} -E ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET} - @${LD} -x -r ${.TARGET} - @mv a.out ${.TARGET} - -.s.po: - ${CPP} -E -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET} - @${LD} -X -r ${.TARGET} - @mv a.out ${.TARGET} + @echo "${COMPILE.cc} -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}" + @${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} + @${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}.o" + @${COMPILE.S} -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}.o" + @${COMPILE.S} ${PICFLAG} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o + +.if !defined(PICFLAG) +PICFLAG=-fpic +.endif .if !defined(NOPROFILE) _LIBS=lib${LIB}.a lib${LIB}_p.a @@ -49,62 +86,107 @@ _LIBS=lib${LIB}.a lib${LIB}_p.a _LIBS=lib${LIB}.a .endif -all: ${_LIBS} # llib-l${LIB}.ln +.if !defined(NOPIC) +_LIBS+=lib${LIB}_pic.a +.if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) +_LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +.endif +.endif + +.if !defined(NOLINT) +_LIBS+=llib-l${LIB}.ln +.endif + +all: ${_LIBS} _SUBDIRUSE OBJS+= ${SRCS:N*.h:R:S/$/.o/g} lib${LIB}.a:: ${OBJS} @echo building standard ${LIB} library @rm -f lib${LIB}.a - @${AR} cTq lib${LIB}.a `lorder ${OBJS} | tsort` ${LDADD} + @${AR} cq lib${LIB}.a `lorder ${OBJS} | tsort -q` ${RANLIB} lib${LIB}.a POBJS+= ${OBJS:.o=.po} lib${LIB}_p.a:: ${POBJS} @echo building profiled ${LIB} library @rm -f lib${LIB}_p.a - @${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${LDADD} + @${AR} cq lib${LIB}_p.a `lorder ${POBJS} | tsort -q` ${RANLIB} lib${LIB}_p.a -llib-l${LIB}.ln: ${SRCS} - ${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c} +SOBJS+= ${OBJS:.o=.so} +lib${LIB}_pic.a:: ${SOBJS} + @echo building shared object ${LIB} library + @rm -f lib${LIB}_pic.a + @${AR} cq lib${LIB}_pic.a `lorder ${SOBJS} | tsort -q` + ${RANLIB} lib${LIB}_pic.a + +lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD} + @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\) + @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} + $(LD) -x -Bshareable -Bforcearchive \ + -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib${LIB}_pic.a ${LDADD} + +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 + @rm -f llib-l${LIB}.ln + @${LINT} -C${LIB} ${LOBJS} ${LLIBS} .if !target(clean) -clean: - rm -f a.out Errs errs mklog core ${CLEANFILES} - rm -f ${OBJS} - rm -f ${POBJS} profiled/*.o - rm -f lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln +clean: _SUBDIRUSE + rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} + rm -f lib${LIB}.a ${OBJS} + rm -f lib${LIB}_p.a ${POBJS} + rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS} + rm -f llib-l${LIB}.ln ${LOBJS} .endif -cleandir: clean +cleandir: _SUBDIRUSE clean .if defined(SRCS) -afterdepend: +afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ - sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po:/' < .depend > $$TMP; \ + sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so:/' \ + < .depend > $$TMP; \ mv $$TMP .depend) .endif .if !target(install) .if !target(beforeinstall) beforeinstall: - @install -d -o root -g wheel -m 755 ${DESTDIR}${LIBDIR} .endif realinstall: # ranlib lib${LIB}.a - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \ + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \ ${DESTDIR}${LIBDIR} ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a + chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a .if !defined(NOPROFILE) # ranlib lib${LIB}_p.a - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ lib${LIB}_p.a ${DESTDIR}${LIBDIR} ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a + chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a +.endif +.if !defined(NOPIC) +# ranlib lib${LIB}_pic.a + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ + lib${LIB}_pic.a ${DESTDIR}${LIBDIR} + ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a + chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a +.endif +.if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR} +.endif +.if !defined(NOLINT) + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR} .endif -# install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -# llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR} .if defined(LINKS) && !empty(LINKS) @set ${LINKS}; \ while test $$# -ge 2; do \ @@ -118,7 +200,7 @@ realinstall: done; true .endif -install: maninstall +install: maninstall _SUBDIRUSE maninstall: afterinstall afterinstall: realinstall realinstall: beforeinstall @@ -128,5 +210,11 @@ realinstall: beforeinstall .include .endif +.if !defined(NONLS) +.include +.endif + .include .include +.include +.include