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.95 retrieving revision 1.140 diff -u -p -r1.95 -r1.140 --- src/share/mk/bsd.lib.mk 1997/05/06 21:29:38 1.95 +++ src/share/mk/bsd.lib.mk 1998/09/28 08:13:38 1.140 @@ -1,24 +1,30 @@ -# $NetBSD: bsd.lib.mk,v 1.95 1997/05/06 21:29:38 mycroft Exp $ +# $NetBSD: bsd.lib.mk,v 1.140 1998/09/28 08:13:38 christos 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 -.PHONY: cleanlib afterdepend beforeinstall libinstall afterinstall +.endif -.include # for 'NOPIC' definition +.PHONY: cleanlib libinstall +realinstall: libinstall +clean cleandir distclean: cleanlib .if exists(${.CURDIR}/shlib_version) SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor .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 +# 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 .m .F .f .r .y .l .cl .p .h +.SUFFIXES: .sh .m4 .m # Set PICFLAGS to cc flags for producing position-independent code, @@ -26,31 +32,34 @@ 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: ?? -# CPICFLAGS: flags to compile .c files for .so objects. -# APICFLAGS: flags to assemble .S files for .so objects. +# 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 +# (usually just ${CPPPICFLAGS} ${CPICFLAGS}) +# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects. .if (${MACHINE_ARCH} == "alpha") - -SHLIB_TYPE=ELF + # Alpha-specific shared library flags SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o -SHLIB_SOVERSION=${SHLIB_MAJOR} -CPICFLAGS ?= -fpic -DPIC -APICFLAGS ?= -DPIC +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?= @@ -66,21 +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 -DPIC -APICFLAGS?= -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 @@ -97,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} @@ -117,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 @@ -130,16 +165,20 @@ 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 - -.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) @@ -149,33 +188,38 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHL .endif .endif -.if !defined(NOLINT) +.if !defined(NOLINT) && !defined(NOLINKLIB) _LIBS+=llib-l${LIB}.ln .endif -all: ${_LIBS} _SUBDIRUSE - -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +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 - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 ${.ALLSRC} \ - ${.TARGET} + ${INSTALL} ${PRESERVE} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ + ${.ALLSRC} ${.TARGET} ${RANLIB} -t ${.TARGET} chmod ${LIBMODE} ${.TARGET} +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 -POBJS+= ${OBJS:.o=.po} +POBJS+= ${OBJS:.o=.po} lib${LIB}_p.a:: ${POBJS} __archivebuild @echo building profiled ${LIB} library -SOBJS+= ${OBJS:.o=.so} +SOBJS+= ${OBJS:.o=.so} lib${LIB}_pic.a:: ${SOBJS} __archivebuild @echo building shared object ${LIB} library @@ -183,37 +227,33 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO ${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 ${LDADD} -.elif (${SHLIB_TYPE} == "ELF") - $(LD) -x -shared -o ${.TARGET} \ - -soname lib${LIB}.so.${SHLIB_SOVERSION} ${SHLIB_LDSTARTFILE} \ + $(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} \ + lib${LIB}.so.${SHLIB_MAJOR} + rm -f lib${LIB}.so + ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + lib${LIB}.so .endif -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} 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} -clean: _SUBDIRUSE cleanlib -cleandir: _SUBDIRUSE cleanlib -.else -cleandir: _SUBDIRUSE clean -.endif - .if defined(SRCS) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ @@ -222,11 +262,11 @@ afterdepend: .depend mv $$TMP .depend) .endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif +.if !target(libinstall) +# Make sure it gets defined, in case NOPIC && NOLINKLIB are defined +libinstall:: +.if !defined(NOLINKLIB) libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a .if !defined(UPDATE) .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a @@ -237,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 @@ -251,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 @@ -275,19 +316,21 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB .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") + ${INSTALL} ${PRESERVE} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${.ALLSRC} ${.TARGET} +.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 @@ -298,31 +341,18 @@ ${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} + ${INSTALL} ${PRESERVE} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${.ALLSRC} ${DESTDIR}${LINTLIBDIR} .endif - -libinstall:: linksinstall -realinstall: libinstall filesinstall - -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 .include + +# Make sure all of the standard targets are defined, even if they do nothing. +lint regress: