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.114 retrieving revision 1.139 diff -u -p -r1.114 -r1.139 --- src/share/mk/bsd.lib.mk 1997/05/30 01:54:42 1.114 +++ src/share/mk/bsd.lib.mk 1998/09/13 23:25:18 1.139 @@ -1,16 +1,19 @@ -# $NetBSD: bsd.lib.mk,v 1.114 1997/05/30 01:54:42 cjs Exp $ +# $NetBSD: bsd.lib.mk,v 1.139 1998/09/13 23:25:18 tv 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 + .PHONY: cleanlib libinstall realinstall: libinstall -clean cleandir: cleanlib +clean cleandir distclean: cleanlib .if exists(${.CURDIR}/shlib_version) SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major @@ -20,7 +23,8 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio # 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 +.SUFFIXES: .out .a .ln .so .po .o .s .S .c .cc .C .m .F .f .r .y .l .cl .p .h +.SUFFIXES: .sh .m4 .m # Set PICFLAGS to cc flags for producing position-independent code, @@ -28,12 +32,14 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio # 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". +# OBJECT_FMT: currently either "ELF" or "a.out", from # 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: ?? +# SHLIB_SHFLAGS: Flags to tell ${LD} to emit shared library. +# with ELF, also set shared-lib version for ld.so. +# SHLIB_LDSTARTFILE: support .o file, call C++ file-level constructors +# SHLIB_LDENDFILE: support .o file, call C++ file-level destructors # 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 @@ -41,23 +47,19 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio # APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects. .if (${MACHINE_ARCH} == "alpha") + # Alpha-specific shared library flags +SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o +SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o -SHLIB_TYPE=ELF -SHLIB_LDSTARTFILE= ${BUILDDIR}/usr/lib/crtbeginS.o -SHLIB_LDENDFILE= ${BUILDDIR}/usr/lib/crtendS.o -SHLIB_SOVERSION=${SHLIB_MAJOR} CPICFLAGS ?= -fpic -DPIC CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS ?= - .elif (${MACHINE_ARCH} == "mips") - -SHLIB_TYPE=ELF -# still use gnu-derived ld.so on pmax; don't have or need lib<>.so support. + # mips-specific shared library flags +# 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?= @@ -73,23 +75,29 @@ AS+= -KPIC .else -SHLIB_TYPE=a.out +# Platform-independent flags for NetBSD a.out shared libraries (and PowerPC) SHLIB_LDSTARTFILE= SHLIB_LDENDFILE= +SHLIB_SHFLAGS= SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} -CPICFLAGS?= -fpic +CPICFLAGS?= -fpic -DPIC CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS?= -k .endif +# Platform-independent linker flags for ELF shared libraries +.if (${OBJECT_FMT} == "ELF") +SHLIB_SOVERSION=${SHLIB_MAJOR} +SHLIB_SHFLAGS=-soname lib${LIB}.so.${SHLIB_SOVERSION} +.endif CFLAGS+= ${COPTS} .c.o: @echo ${COMPILE.c:Q} ${.IMPSRC} - @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o + @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o @@ -106,7 +114,7 @@ CFLAGS+= ${COPTS} @rm -f ${.TARGET}.o .c.ln: - ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i ${.IMPSRC} + ${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC} .cc.o .C.o: @echo ${COMPILE.cc:Q} ${.IMPSRC} @@ -126,6 +134,24 @@ CFLAGS+= ${COPTS} @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o +.m.o: + @echo ${COMPILE.m:Q} ${.IMPSRC} + @${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o + +.m.po: + @echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET} + @${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o + @${LD} -X -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o + +.m.so: + @echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET} + @${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @rm -f ${.TARGET}.o + .S.o .s.o: @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @@ -144,11 +170,15 @@ CFLAGS+= ${COPTS} @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o - -.if !defined(NOPROFILE) -_LIBS=lib${LIB}.a lib${LIB}_p.a -.else +.if defined(NOPIC) || (defined(LDSTATIC) && ${LDSTATIC} != "") \ + || !defined(NOLINKLIB) _LIBS=lib${LIB}.a +.else +_LIBS= +.endif + +.if !defined(NOPROFILE) && !defined(NOLINKLIB) +_LIBS+=lib${LIB}_p.a .endif .if !defined(NOPIC) @@ -158,7 +188,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHL .endif .endif -.if !defined(NOLINT) +.if !defined(NOLINT) && !defined(NOLINKLIB) _LIBS+=llib-l${LIB}.ln .endif @@ -166,7 +196,7 @@ all: ${SRCS} ${_LIBS} __archivebuild: .USE @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `NM=${NM} lorder ${.ALLSRC} | tsort -q` + @${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}` ${RANLIB} ${.TARGET} __archiveinstall: .USE @@ -177,68 +207,38 @@ __archiveinstall: .USE DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} CLEANFILES+= ${DPSRCS} +.if defined(YHEADER) +CLEANFILES+= ${SRCS:M*.y:.y=.h} +.endif OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} lib${LIB}.a:: ${OBJS} __archivebuild @echo building standard ${LIB} library -.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} __archivebuild @echo building profiled ${LIB} library -.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} __archivebuild @echo building shared object ${LIB} library -.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} @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 ${.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 \ - -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} + $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ + ${SHLIB_LDSTARTFILE} \ + --whole-archive lib${LIB}_pic.a --no-whole-archive ${LDADD} \ + ${SHLIB_LDENDFILE} +.if (${OBJECT_FMT} == "ELF") + rm -f 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 + lib${LIB}.so.${SHLIB_MAJOR} + rm -f lib${LIB}.so ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${BUILDDIR}${LIBDIR}/lib${LIB}.so -.endif # SHLIB_TYPE == ELF -.endif # defined(OBJDIR) + lib${LIB}.so +.endif LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} LLIBS?= -lc @@ -251,7 +251,7 @@ 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 lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS} rm -f llib-l${LIB}.ln ${LOBJS} .if defined(SRCS) @@ -262,13 +262,11 @@ afterdepend: .depend mv $$TMP .depend) .endif -# Define NOINSTALL if this is a library that is used during the build -# only, and should not be installed into DESTDIR. -.if defined(NOINSTALL) +.if !target(libinstall) +# Make sure it gets defined, in case NOPIC && NOLINKLIB are defined libinstall:: -.endif -.if !target(libinstall) +.if !defined(NOLINKLIB) libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a .if !defined(UPDATE) .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a @@ -279,8 +277,9 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE .PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a ${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall +.endif -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && !defined(NOLINKLIB) libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a .if !defined(UPDATE) .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a @@ -293,7 +292,7 @@ ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall .endif -.if !defined(NOPIC) +.if !defined(NOPIC) && !defined(NOPICINSTALL) && !defined(NOLINKLIB) libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a .if !defined(UPDATE) .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a @@ -319,17 +318,19 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB ${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") +.if (${OBJECT_FMT} == "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 +.if !defined(NOLINKLIB) ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ${DESTDIR}${LIBDIR}/lib${LIB}.so .endif .endif +.endif -.if !defined(NOLINT) +.if !defined(NOLINT) && !defined(NOLINKLIB) libinstall:: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln .if !defined(UPDATE) .PHONY: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln @@ -341,22 +342,17 @@ ${DESTDIR}${LINTLIBDIR}/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} + ${.ALLSRC} ${DESTDIR}${LINTLIBDIR} .endif .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: