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.89 retrieving revision 1.113 diff -u -p -r1.89 -r1.113 --- src/share/mk/bsd.lib.mk 1997/03/24 21:54:17 1.89 +++ src/share/mk/bsd.lib.mk 1997/05/29 15:37:11 1.113 @@ -1,23 +1,26 @@ -# $NetBSD: bsd.lib.mk,v 1.89 1997/03/24 21:54:17 christos Exp $ -# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 +# $NetBSD: bsd.lib.mk,v 1.113 1997/05/29 15:37:11 veego 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 - -# 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 +34,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") @@ -69,8 +77,10 @@ SHLIB_TYPE=a.out SHLIB_LDSTARTFILE= SHLIB_LDENDFILE= SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} -CPICFLAGS?= -fpic -DPIC -APICFLAGS?= -fpic -DPIC +CPICFLAGS?= -fpic +CPPPICFLAGS?= -DPIC +CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} +APICFLAGS?= -k .endif @@ -129,8 +139,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,13 +162,11 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHL _LIBS+=llib-l${LIB}.ln .endif -all: ${_LIBS} _SUBDIRUSE - -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +all: ${SRCS} ${_LIBS} -__achivebuild: .USE +__archivebuild: .USE @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${.ALLSRC} | tsort -q` + @${AR} cq ${.TARGET} `NM=${NM} lorder ${.ALLSRC} | tsort -q` ${RANLIB} ${.TARGET} __archiveinstall: .USE @@ -167,16 +175,41 @@ __archiveinstall: .USE ${RANLIB} -t ${.TARGET} chmod ${LIBMODE} ${.TARGET} +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 +.if defined(OBJDIR) + @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} +POBJS+= ${OBJS:.o=.po} lib${LIB}_p.a:: ${POBJS} __archivebuild @echo building profiled ${LIB} library +.if defined(OBJDIR) + @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} +SOBJS+= ${OBJS:.o=.so} lib${LIB}_pic.a:: ${SOBJS} __archivebuild @echo building shared object ${LIB} library +.if defined(OBJDIR) + @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} @@ -184,22 +217,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 ${.TARGET} 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 ${.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) + @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} @@ -207,12 +254,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$$$$; \ @@ -221,11 +262,7 @@ afterdepend: .depend mv $$TMP .depend) .endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif - +.if !target(libinstall) libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a .if !defined(UPDATE) .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a @@ -234,6 +271,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${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) @@ -245,6 +283,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${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 @@ -257,6 +296,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${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 @@ -268,7 +308,8 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI .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} @@ -291,18 +332,11 @@ libinstall:: ${DESTDIR}${LINTLIBDIR}/lli ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE .endif -${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln llib-l${LIB}.ln +.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 - -libinstall:: linksinstall -realinstall: libinstall - -install: ${MANINSTALL} _SUBDIRUSE -${MANINSTALL}: afterinstall -afterinstall: realinstall -realinstall: beforeinstall .endif .if !defined(NOMAN) @@ -314,8 +348,9 @@ realinstall: beforeinstall .endif .include -.include +.include .include +.include .include .include .include