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.88 retrieving revision 1.114.2.1 diff -u -p -r1.88 -r1.114.2.1 --- src/share/mk/bsd.lib.mk 1997/03/23 00:52:20 1.88 +++ src/share/mk/bsd.lib.mk 1997/10/12 22:11:24 1.114.2.1 @@ -1,23 +1,29 @@ -# $NetBSD: bsd.lib.mk,v 1.88 1997/03/23 00:52:20 cgd Exp $ -# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 +# $NetBSD: bsd.lib.mk,v 1.114.2.1 1997/10/12 22:11:24 cjs Exp $ +# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 +.if !target(__initialized__) +__initialized__: .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.include +.include +.MAIN: all +.endif -.include # for 'NOPIC' definition +.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 - -# 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 +# 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 .s .S .c .cc .C .F .f .r .y .l .cl .p .h .sh .m4 # Set PICFLAGS to cc flags for producing position-independent code, @@ -31,17 +37,22 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio # 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. +# CPPICFLAGS: flags for ${CPP} to preprocess .[sS] files for ${AS} +# CPICFLAGS: flags for ${CC} to compile .[cC] files to .so objects. +# CAPICFLAGS flags for {$CC} to compiling .[Ss] files +# (usually just ${CPPPICFLAGS} ${CPICFLAGS}) +# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects. .if (${MACHINE_ARCH} == "alpha") SHLIB_TYPE=ELF -SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o -SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o +SHLIB_LDSTARTFILE= ${BUILDDIR}/usr/lib/crtbeginS.o +SHLIB_LDENDFILE= ${BUILDDIR}/usr/lib/crtendS.o SHLIB_SOVERSION=${SHLIB_MAJOR} CPICFLAGS ?= -fpic -DPIC -APICFLAGS ?= -DPIC +CPPPICFLAGS?= -DPIC +CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} +APICFLAGS ?= .elif (${MACHINE_ARCH} == "mips") @@ -70,7 +81,9 @@ SHLIB_LDSTARTFILE= SHLIB_LDENDFILE= SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} CPICFLAGS?= -fpic -DPIC -APICFLAGS?= -fpic -DPIC +CPPPICFLAGS?= -DPIC +CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} +APICFLAGS?= -k .endif @@ -129,8 +142,8 @@ CFLAGS+= ${COPTS} @rm -f ${.TARGET}.o .S.so .s.so: - @echo ${COMPILE.S:Q} ${APICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} - @${COMPILE.S} ${APICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o + @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} + @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o @@ -152,29 +165,54 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHL _LIBS+=llib-l${LIB}.ln .endif -all: ${_LIBS} _SUBDIRUSE +all: ${SRCS} ${_LIBS} -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +__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} -lib${LIB}.a:: ${OBJS} +DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${DPSRCS} + +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 -q` - ${RANLIB} lib${LIB}.a +.if defined(OBJDIR) && !defined(NOINSTALL) + @echo install -d ${BUILDDIR}${LIBDIR} + @install -d ${BUILDDIR}${LIBDIR} + @echo ${BUILDDIR}${LIBDIR}/${.TARGET} '->' `pwd`/${.TARGET}; + @rm -f ${BUILDDIR}${LIBDIR}/${.TARGET}; + @ln -s `pwd`/${.TARGET} ${BUILDDIR}${LIBDIR}/${.TARGET}; +.endif -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 -q` - ${RANLIB} lib${LIB}_p.a +.if defined(OBJDIR) && !defined(NOINSTALL) + @echo install -d ${BUILDDIR}${LIBDIR} + @install -d ${BUILDDIR}${LIBDIR} + @echo ${BUILDDIR}${LIBDIR}/${.TARGET} '->' `pwd`/${.TARGET}; + @rm -f ${BUILDDIR}${LIBDIR}/${.TARGET}; + @ln -s `pwd`/${.TARGET} ${BUILDDIR}${LIBDIR}/${.TARGET}; +.endif -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 -q` - ${RANLIB} lib${LIB}_pic.a +.if defined(OBJDIR) && !defined(NOINSTALL) + @echo install -d ${BUILDDIR}${LIBDIR} + @install -d ${BUILDDIR}${LIBDIR} + @echo ${BUILDDIR}${LIBDIR}/${.TARGET} '->' `pwd`/${.TARGET}; + @rm -f ${BUILDDIR}${LIBDIR}/${.TARGET}; + @ln -s `pwd`/${.TARGET} ${BUILDDIR}${LIBDIR}/${.TARGET}; +.endif lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD} \ ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} @@ -182,22 +220,36 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO @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 -nostdlib -L${BUILDDIR}/usr/lib ${LDADD} .elif (${SHLIB_TYPE} == "ELF") - $(LD) -x -shared -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + $(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} + --whole-archive lib${LIB}_pic.a --no-whole-archive \ + -L${BUILDDIR}/usr/lib ${LDADD} ${SHLIB_LDENDFILE} .endif +.if defined(OBJDIR) && !defined(NOINSTALL) + @echo install -d ${BUILDDIR}${LIBDIR} + @install -d ${BUILDDIR}${LIBDIR} + @echo ${BUILDDIR}${LIBDIR}/${.TARGET} '->' `pwd`/${.TARGET}; + @rm -f ${BUILDDIR}${LIBDIR}/${.TARGET}; + @ln -s `pwd`/${.TARGET} ${BUILDDIR}${LIBDIR}/${.TARGET}; +.if (${SHLIB_TYPE} == "ELF") + rm -f ${BUILDDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR} + ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${BUILDDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR} + rm -f ${BUILDDIR}${LIBDIR}/lib${LIB}.so + ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${BUILDDIR}${LIBDIR}/lib${LIB}.so +.endif # SHLIB_TYPE == ELF +.endif # defined(OBJDIR) -LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} -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) cleanlib: rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} rm -f lib${LIB}.a ${OBJS} @@ -205,12 +257,6 @@ cleanlib: rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS} rm -f llib-l${LIB}.ln ${LOBJS} -clean: _SUBDIRUSE cleanlib -cleandir: _SUBDIRUSE cleanlib -.else -cleandir: _SUBDIRUSE clean -.endif - .if defined(SRCS) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ @@ -219,34 +265,63 @@ afterdepend: .depend mv $$TMP .depend) .endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: +# Define NOINSTALL if this is a library that is used during the build +# only, and should not be installed into DESTDIR. +.if defined(NOINSTALL) +libinstall:: .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 +.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 + +.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} \ @@ -256,50 +331,30 @@ realinstall: ${DESTDIR}${LIBDIR}/lib${LIB}.so .endif .endif + .if !defined(NOLINT) +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 -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - echo $$t -\> $$l; \ - rm -f $$t; \ - ln -s $$l $$t; \ - done; true -.endif - -install: maninstall _SUBDIRUSE -maninstall: afterinstall -afterinstall: realinstall -realinstall: beforeinstall .endif -.if !defined(NOMAN) .include -.endif - -.if !defined(NONLS) .include -.endif - -.include +.include +.include +.include .include -.include .include + +# Make sure all of the standard targets are defined, even if they do nothing. +lint regress: