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.116
retrieving revision 1.129
diff -u -p -r1.116 -r1.129
--- src/share/mk/bsd.lib.mk	1997/06/04 08:38:45	1.116
+++ src/share/mk/bsd.lib.mk	1998/04/09 00:32:36	1.129
@@ -1,13 +1,16 @@
-#	$NetBSD: bsd.lib.mk,v 1.116 1997/06/04 08:38:45 pk Exp $
+#	$NetBSD: bsd.lib.mk,v 1.129 1998/04/09 00:32:36 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 <bsd.own.mk>
-
+.include <bsd.obj.mk>
 .MAIN:		all
+.endif
+
 .PHONY:		cleanlib libinstall
 realinstall:	libinstall
 clean cleandir:	cleanlib
@@ -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,16 @@ 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 <bsd.own.mk>
 # 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
+# SHLIB_WHOLE:		turn on whole-archive
+# SHLIB_NOWHOLE:	turn off whole-archive
 # 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 +49,19 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio
 # 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
 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,10 +77,13 @@ 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}
+SHLIB_WHOLE=-Bforcearchive
+SHLIB_NOWHOLE=
 CPICFLAGS?= -fpic -DPIC
 CPPPICFLAGS?= -DPIC 
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
@@ -84,12 +91,19 @@ APICFLAGS?= -k
 
 .endif
 
+# Platform-independent linker flags for ELF shared libraries
+.if (${OBJECT_FMT} == "ELF")
+SHLIB_WHOLE=--whole-archive
+SHLIB_NOWHOLE=--no-whole-archive
+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 +120,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 +140,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
@@ -166,7 +198,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} | ${TSORT}`
 	${RANLIB} ${.TARGET}
 
 __archiveinstall: .USE
@@ -177,6 +209,9 @@ __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
@@ -194,15 +229,10 @@ 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}
-.endif
 
 LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 LLIBS?=		-lc
@@ -277,7 +307,7 @@ ${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}
@@ -303,18 +333,13 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 .endif
 .endif
 
-.if !defined(NOMAN)
 .include <bsd.man.mk>
-.endif
-
-.if !defined(NONLS)
 .include <bsd.nls.mk>
-.endif
-
-.include <bsd.obj.mk>
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
 .include <bsd.dep.mk>
-.include <bsd.subdir.mk>
 .include <bsd.sys.mk>
+
+# Make sure all of the standard targets are defined, even if they do nothing.
+lint regress: