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.63 retrieving revision 1.103 diff -u -p -r1.63 -r1.103 --- src/share/mk/bsd.lib.mk 1995/09/26 23:48:24 1.63 +++ src/share/mk/bsd.lib.mk 1997/05/09 13:25:53 1.103 @@ -1,39 +1,100 @@ -# $NetBSD: bsd.lib.mk,v 1.63 1995/09/26 23:48:24 jtc Exp $ -# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 +# $NetBSD: bsd.lib.mk,v 1.103 1997/05/09 13:25:53 mycroft Exp $ +# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -.include # for 'NOPIC' definition +.include + +.MAIN: all +.PHONY: cleanlib libinstall +realinstall: libinstall +clean cleandir: cleanlib .if exists(${.CURDIR}/shlib_version) SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor .endif -.MAIN: all +# add additional suffixes not exported. +# .po is used for profiling object files. +# .so is used for PIC object files. +.SUFFIXES: .out .a .ln .so .po .o .c .cc .C .F .f .r .y .l .s .S .cl .p .h .sh .m4 + + +# Set PICFLAGS to cc flags for producing position-independent code, +# if not already set. Includes -DPIC, if required. + +# Data-driven table using make variables to control how shared libraries +# are built for different platforms and object formats. +# SHLIB_TYPE: currently either "ELF" or "a.out". +# SHLIB_SOVERSION: version number to be compiled into a shared library +# via -soname. Usualy ${SHLIB_MAJOR} on ELF. +# NetBSD/pmax used to use ${SHLIB_MAJOR}.{SHLIB-MINOR}. +# SHLIB_LDSTARTFILE: ??? +# SHLIB_LDENDTILE: ?? +# CPICFLAGS: flags to compile .c files for .so objects. +# APICFLAGS: flags to assemble .S files for .so objects. + +.if (${MACHINE_ARCH} == "alpha") + +SHLIB_TYPE=ELF +SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o +SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o +SHLIB_SOVERSION=${SHLIB_MAJOR} +CPICFLAGS ?= -fpic -DPIC +APICFLAGS ?= -DPIC + +.elif (${MACHINE_ARCH} == "mips") + +SHLIB_TYPE=ELF +# still use gnu-derived ld.so on pmax; don't have or need lib<>.so support. +SHLIB_LDSTARTFILE= +SHLIB_LDENDFILE= +SHLIB_SOVERSION=${SHLIB_MAJOR} + +# On mips, all libs need to be compiled with ABIcalls, not just sharedlibs. +CPICFLAGS?= +APICFLAGS?= +#CPICFLAGS?= -fpic -DPIC +#APICFLAGS?= -DPIC + +# so turn shlib PIC flags on for ${CPP}, ${CC}, and ${AS} as follows: +AINC+=-DPIC -DABICALLS +COPTS+= -fPIC ${AINC} +AFLAGS+= -fPIC +AS+= -KPIC + +.else + +SHLIB_TYPE=a.out +SHLIB_LDSTARTFILE= +SHLIB_LDENDFILE= +SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} +CPICFLAGS?= -fpic -DPIC +APICFLAGS?= -fpic -DPIC + +.endif + -# 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 .so .S .s .c .cc .C .f .y .l .ln .m4 +CFLAGS+= ${COPTS} .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} -p ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.c} -p ${.IMPSRC} -o ${.TARGET}.o + @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}" - @${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o + @echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET} + @${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o @@ -41,50 +102,41 @@ 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} -p ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -p ${.IMPSRC} -o ${.TARGET}.o + @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}" - @${COMPILE.cc} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o + @echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET} + @${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.o .s.o: - @echo "${CPP} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}" - @${CPP} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}.o + @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 "${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}" - @${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -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 "${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -k -o ${.TARGET}" - @${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -k -o ${.TARGET}.o + @echo ${COMPILE.S:Q} ${APICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} + @${COMPILE.S} ${APICFLAGS} ${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 @@ -103,113 +155,145 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHL _LIBS+=llib-l${LIB}.ln .endif -all: ${_LIBS} _SUBDIRUSE +all: ${SRCS} ${_LIBS} + +__archivebuild: .USE + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} `NM=${NM} lorder ${.ALLSRC} | tsort -q` + ${RANLIB} ${.TARGET} + +__archiveinstall: .USE + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 ${.ALLSRC} \ + ${.TARGET} + ${RANLIB} -t ${.TARGET} + chmod ${LIBMODE} ${.TARGET} -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +DPSRCS+= ${SRCS:M*.[ly]:.l=.c:.y=.c} +CLEANFILES+= ${DPSRCS} -lib${LIB}.a:: ${OBJS} +OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} +lib${LIB}.a:: ${OBJS} __archivebuild @echo building standard ${LIB} library - @rm -f lib${LIB}.a - @${AR} cq lib${LIB}.a `lorder ${OBJS} | tsort` - ${RANLIB} lib${LIB}.a -POBJS+= ${OBJS:.o=.po} -lib${LIB}_p.a:: ${POBJS} +POBJS+= ${OBJS:.o=.po} +lib${LIB}_p.a:: ${POBJS} __archivebuild @echo building profiled ${LIB} library - @rm -f lib${LIB}_p.a - @${AR} cq lib${LIB}_p.a `lorder ${POBJS} | tsort` - ${RANLIB} lib${LIB}_p.a -SOBJS+= ${OBJS:.o=.so} -lib${LIB}_pic.a:: ${SOBJS} +SOBJS+= ${OBJS:.o=.so} +lib${LIB}_pic.a:: ${SOBJS} __archivebuild @echo building shared object ${LIB} library - @rm -f lib${LIB}_pic.a - @${AR} cq lib${LIB}_pic.a `lorder ${SOBJS} | tsort` - ${RANLIB} lib${LIB}_pic.a -lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD} +lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD} \ + ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\) @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +.if (${SHLIB_TYPE} == "a.out") $(LD) -x -Bshareable -Bforcearchive \ - -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib${LIB}_pic.a ${LDADD} + -o ${.TARGET} lib${LIB}_pic.a ${LDADD} +.elif (${SHLIB_TYPE} == "ELF") + $(LD) -x -shared -o ${.TARGET} \ + -soname lib${LIB}.so.${SHLIB_SOVERSION} ${SHLIB_LDSTARTFILE} \ + --whole-archive lib${LIB}_pic.a --no-whole-archive ${LDADD} \ + ${SHLIB_LDENDFILE} +.endif -LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} -# the following looks XXX to me... -- cgd -LLIBS?= -lc +LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} +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: _SUBDIRUSE +cleanlib: 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: _SUBDIRUSE clean .if defined(SRCS) -afterdepend: +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 -.if !target(install) -.if !target(beforeinstall) -beforeinstall: +.if !target(libinstall) +libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a +.endif +.if !defined(BUILD) +${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE .endif -realinstall: -# ranlib 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 +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a +${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall + .if !defined(NOPROFILE) -# ranlib lib${LIB}_p.a - 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 +libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a .endif +.if !defined(BUILD) +${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE +.endif + +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a +${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall +.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 +libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a +.endif +.if !defined(BUILD) +${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE +.endif + +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a +${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib${LIB}_pic.a __archiveinstall .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} +libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +.endif +.if !defined(BUILD) +${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE +.endif + +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} \ + ${.TARGET} +.if (${SHLIB_TYPE} == "ELF") + rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR} + ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR} + rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so + ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${DESTDIR}${LIBDIR}/lib${LIB}.so +.endif .endif + .if !defined(NOLINT) - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ +libinstall:: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln +.endif +.if !defined(BUILD) +${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE +.endif + +.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln +${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR} .endif -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - echo $$t -\> $$l; \ - rm -f $$t; \ - ln $$l $$t; \ - done; true -.endif - -install: maninstall _SUBDIRUSE -maninstall: afterinstall -afterinstall: realinstall -realinstall: beforeinstall .endif .if !defined(NOMAN) @@ -221,5 +305,9 @@ realinstall: beforeinstall .endif .include +.include +.include +.include .include .include +.include