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.251 retrieving revision 1.259 diff -u -p -r1.251 -r1.259 --- src/share/mk/bsd.lib.mk 2004/04/18 13:11:31 1.251 +++ src/share/mk/bsd.lib.mk 2005/01/10 02:42:34 1.259 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.251 2004/04/18 13:11:31 lukem Exp $ +# $NetBSD: bsd.lib.mk,v 1.259 2005/01/10 02:42:34 lukem Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -20,12 +20,24 @@ LDADD+= ${LDADD.lib${LIB}} LDFLAGS+= ${LDFLAGS.lib${LIB}} LDSTATIC+= ${LDSTATIC.lib${LIB}} +##### Libraries that this may depend upon. +.if defined(LIBDPLIBS) && ${MKPIC} != "no" # { +.for _lib _dir in ${LIBDPLIBS} +.if !defined(LIBDO.${_lib}) +LIBDO.${_lib}!= cd ${_dir} && ${PRINTOBJDIR} +.MAKEOVERRIDES+=LIBDO.${_lib} +.endif +LDADD+= -L${LIBDO.${_lib}} -l${_lib} +DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so +.endfor +.endif # } + ##### Build and install rules MKDEP_SUFFIXES?= .o .po .so .ln CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} -.if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE}) +.if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE}) # { SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny @@ -38,7 +50,7 @@ checkver: ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \ -d ${DESTDIR}${_LIBSODIR} ${LIB}) .endif -.endif +.endif # } .if !target(checkver) checkver: @@ -65,7 +77,7 @@ print-shlib-teeny: @false .endif -.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR) +.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR) # { .if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR) .if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY) SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY} @@ -75,7 +87,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB .else SHLIB_FULLVERSION=${SHLIB_MAJOR} .endif -.endif +.endif # } # add additional suffixes not exported. # .po is used for profiling object files. @@ -107,7 +119,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} # (usually just ${CPPPICFLAGS} ${CPICFLAGS}) # APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects. -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} == "alpha" # { FPICFLAGS ?= -fPIC CPICFLAGS ?= -fPIC -DPIC @@ -116,7 +128,7 @@ CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS ?= .elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && \ - ${OBJECT_FMT} == "ELF" + ${OBJECT_FMT} == "ELF" # } { # If you use -fPIC you need to define BIGPIC to turn on 32-bit # relocations in asm code @@ -126,7 +138,7 @@ CPPPICFLAGS?= -DPIC -DBIGPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS ?= -KPIC -.elif ${MACHINE_ARCH} == "ns32k" +.elif ${MACHINE_ARCH} == "ns32k" # } { # XXX no shared libraries yet on ns32k FPICFLAGS?= @@ -135,7 +147,7 @@ CPPPICFLAGS?= CAPICFLAGS?= APICFLAGS?= -.else +.else # } { # Platform-independent flags for NetBSD shared libraries SHLIB_SOVERSION=${SHLIB_FULLVERSION} @@ -146,7 +158,7 @@ CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS?= -k -.endif +.endif # } .if ${MKPICLIB} != "no" CSHLIBFLAGS+= ${CPICFLAGS} @@ -167,6 +179,7 @@ SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${DEST .endif CFLAGS+= ${COPTS} +AFLAGS+= ${COPTS} FFLAGS+= ${FOPTS} .c.o: @@ -329,7 +342,7 @@ FFLAGS+= ${FOPTS} ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET} rm -f ${.TARGET}.tmp -.if defined(LIB) +.if defined(LIB) # { .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \ || ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no" _LIBS=lib${LIB}.a @@ -339,12 +352,19 @@ _LIBS= OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g} +STOBJS+=${OBJS} + +.if ${MKPRIVATELIB} != "no" +# No installation is required +libinstall:: +.else # ${MKPRIVATELIB} == "no" # { + .if ${MKPROFILE} != "no" _LIBS+=lib${LIB}_p.a POBJS+=${OBJS:.o=.po} .endif -.if ${MKPIC} != "no" +.if ${MKPIC} != "no" # { .if ${MKPICLIB} == "no" .if ${MKSHLIBOBJS} != "no" # make _pic.a, which isn't really pic, @@ -363,28 +383,32 @@ SOBJS+=${OBJS:.o=.so} .if defined(SHLIB_FULLVERSION) _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION} .endif -.endif +.endif # } LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} .if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS) _LIBS+=llib-l${LIB}.ln .endif +.endif # ${MKPRIVATELIB} == "no" # } + ALLOBJS= .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \ || ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no" -ALLOBJS+=${OBJS} +ALLOBJS+=${STOBJS} .endif ALLOBJS+=${POBJS} ${SOBJS} .if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS) ALLOBJS+=${LOBJS} .endif -.else +.else # !defined(LIB) # } { LOBJS= SOBJS= -.endif +.endif # !defined(LIB) # } -.NOPATH: ${ALLOBJS} ${_LIBS} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} +_YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} + +.NOPATH: ${ALLOBJS} ${_LIBS} ${_YLSRCS} realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} @@ -407,13 +431,12 @@ __archivesymlinkpic: .USE ${_MKTARGET_INSTALL} ${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET} -DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${YHEADER:D${SRCS:M*.y:.y=.h}} +DPSRCS+= ${_YLSRCS} +CLEANFILES+= ${_YLSRCS} -${OBJS} ${POBJS} ${SOBJS} ${LOBJS}: ${DPSRCS} +${STOBJS} ${POBJS} ${SOBJS} ${LOBJS}: ${DPSRCS} -lib${LIB}.a:: ${OBJS} __archivebuild +lib${LIB}.a:: ${STOBJS} __archivebuild lib${LIB}_p.a:: ${POBJS} __archivebuild @@ -456,7 +479,7 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL mv -f lib${LIB}.so.tmp lib${LIB}.so .endif -.if !empty(LOBJS) +.if !empty(LOBJS) # { LLIBS?= -lc llib-l${LIB}.ln: ${LOBJS} ${_MKTARGET_COMPILE} @@ -466,17 +489,18 @@ llib-l${LIB}.ln: ${LOBJS} .else ${LINT} -C${LIB} ${.ALLSRC} ${LLIBS} .endif -.endif +.endif # } cleanlib: .PHONY rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} - rm -f lib${LIB}.a ${OBJS} + rm -f lib${LIB}.a ${STOBJS} rm -f lib${LIB}_p.a ${POBJS} rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS} - rm -f ${OBJS:=.tmp} ${POBJS:=.tmp} ${SOBJS:=.tmp} + rm -f ${STOBJS:=.tmp} ${POBJS:=.tmp} ${SOBJS:=.tmp} rm -f llib-l${LIB}.ln ${LOBJS} -.if !target(libinstall) + +.if !target(libinstall) # { # Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no libinstall:: @@ -606,7 +630,7 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR} .endif -.endif +.endif # !target(libinstall) # } ##### Pull in related .mk logic .include