Switch to using ".So" as the extension for PIC object files rather

than ".so".  The old extension conflicted with well-established
naming conventions for dynamically loadable modules.

The "clean" targets continue to remove ".so" files too, to deal with
old systems.

17 files changed, 79 insertions, 74 deletions

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index cbae22a..260001a 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.17 1998/07/08 00:45:50 bde Exp $
+# $Id: Makefile,v 1.18 1998/10/06 11:28:29 peter Exp $
 #
 
 LIB=	gcc
@@ -50,8 +50,8 @@ CLEANFILES+=	${COMMONHDRS}
 
 LIB1OBJS=	${LIB1FUNCS:S/$/.o/}
 LIB2OBJS=	${LIB2FUNCS:S/$/.o/}
-LIB1SOBJS=	${LIB1FUNCS:S/$/.so/}
-LIB2SOBJS=	${LIB2FUNCS:S/$/.so/}
+LIB1SOBJS=	${LIB1FUNCS:S/$/.So/}
+LIB2SOBJS=	${LIB2FUNCS:S/$/.So/}
 LIB1POBJS=	${LIB1FUNCS:S/$/.po/}
 LIB2POBJS=	${LIB2FUNCS:S/$/.po/}
 
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 10c3198..b8059d4 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.10 1998/10/11 04:56:03 peter Exp $
+# $Id: Makefile,v 1.11 1998/12/27 17:25:27 bde Exp $
 #
 
 GPPDIR=	${.CURDIR}/../../../contrib/libg++
@@ -99,7 +99,7 @@ ${file}.o: ${file}.cc
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-${file}.so: ${file}.cc
+${file}.So: ${file}.cc
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
@@ -118,7 +118,7 @@ ${file}.o: ${file}.cc
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-${file}.so: ${file}.cc
+${file}.So: ${file}.cc
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 3b085c6..3c0f2e8 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.14 1997/02/22 15:44:57 peter Exp $
 #
 .include "../Makefile.inc"
 
@@ -24,6 +24,6 @@ NOPIC=		YES
 install:
 	@true
 
-${OUT_OBJ}.o ${OUT_OBJ}.so:	${OUT_FILE}
+${OUT_OBJ}.o ${OUT_OBJ}.So:	${OUT_FILE}
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index cbae22a..260001a 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.17 1998/07/08 00:45:50 bde Exp $
+# $Id: Makefile,v 1.18 1998/10/06 11:28:29 peter Exp $
 #
 
 LIB=	gcc
@@ -50,8 +50,8 @@ CLEANFILES+=	${COMMONHDRS}
 
 LIB1OBJS=	${LIB1FUNCS:S/$/.o/}
 LIB2OBJS=	${LIB2FUNCS:S/$/.o/}
-LIB1SOBJS=	${LIB1FUNCS:S/$/.so/}
-LIB2SOBJS=	${LIB2FUNCS:S/$/.so/}
+LIB1SOBJS=	${LIB1FUNCS:S/$/.So/}
+LIB2SOBJS=	${LIB2FUNCS:S/$/.So/}
 LIB1POBJS=	${LIB1FUNCS:S/$/.po/}
 LIB2POBJS=	${LIB2FUNCS:S/$/.po/}
 
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index 100d3dd..2d92a90 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 1998/09/12 19:16:32 markm Exp $
+# $Id: Makefile,v 1.4 1998/09/16 17:25:51 markm Exp $
 #
 
 LIB=	perl
@@ -21,7 +21,7 @@ CLEANFILES+=	config.h config.sh config_h.sh
 
 .SUFFIXES:
 
-.SUFFIXES: .o .po .so .s .S .c
+.SUFFIXES: .o .po .So .s .S .c
 
 .PATH:	${PERL5SRC}
 
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index 219f923..473dc99 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,10 +1,10 @@
 #
-#	$Id: Makefile,v 1.5 1998/05/04 02:06:09 jb Exp $
+#	$Id: Makefile,v 1.6 1998/08/20 21:37:22 jb Exp $
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c
 OBJS=		crt1.o crtbegin.o crtend.o
-SOBJS=		crtbegin.so crtend.so
+SOBJS=		crtbegin.So crtend.So
 CFLAGS+=	-Wall -Wno-unused -I${.CURDIR}/../../../libexec/rtld-elf
 NOMAN=		true
 NOPIC=		true
@@ -16,7 +16,7 @@ all: ${OBJS} ${SOBJS}
 realinstall:
 .for file in ${OBJS} ${SOBJS}
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.so$/S.o/}
+	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
 .endfor
 
 .include <bsd.lib.mk>
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index 6432efe..ae195e8 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -1,11 +1,11 @@
 #
-#	$Id: Makefile,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $
+#	$Id: Makefile,v 1.2 1998/09/07 23:31:59 jdp Exp $
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		gcrt1.o
-SOBJS=		crtbegin.so crtend.so
+SOBJS=		crtbegin.So crtend.So
 CFLAGS+=	-elf
 CFLAGS+=	-Wall -Wno-unused
 LDFLAGS+=	-elf
@@ -22,7 +22,7 @@ gcrt1.o:	crt1.c
 realinstall:
 .for file in ${OBJS} ${SOBJS}
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.so$/S.o/}
+	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
 .endfor
 
 .include <bsd.lib.mk>
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile
index 6432efe..ae195e8 100644
--- a/lib/csu/i386-elf/Makefile
+++ b/lib/csu/i386-elf/Makefile
@@ -1,11 +1,11 @@
 #
-#	$Id: Makefile,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $
+#	$Id: Makefile,v 1.2 1998/09/07 23:31:59 jdp Exp $
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		gcrt1.o
-SOBJS=		crtbegin.so crtend.so
+SOBJS=		crtbegin.So crtend.So
 CFLAGS+=	-elf
 CFLAGS+=	-Wall -Wno-unused
 LDFLAGS+=	-elf
@@ -22,7 +22,7 @@ gcrt1.o:	crt1.c
 realinstall:
 .for file in ${OBJS} ${SOBJS}
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.so$/S.o/}
+	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
 .endfor
 
 .include <bsd.lib.mk>
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index db3057f..12d5cb4 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -58,7 +58,7 @@ help.h: ${ASRC} makelist
 editline.c:
 	sh ${.CURDIR}/makelist -e ${OSRCS} > ${.TARGET}
 
-beforedepend editline.o editline.po editline.so: \
+beforedepend editline.o editline.po editline.So: \
 	vi.h emacs.h common.h fcns.h fcns.c help.h help.c
 
 test:	test.o libedit.a ${DPADD} ${LIBTERMCAP}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index c783a62..984897c 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.81 1998/11/18 00:48:11 jdp Exp $
+#	$Id: bsd.lib.mk,v 1.82 1998/12/06 17:14:37 bde Exp $
 #
 
 .if !target(__initialized__)
@@ -40,9 +40,9 @@ STRIP?=	-s
 .MAIN: all
 
 # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-# .so used for PIC object files
+# .So used for PIC object files
 .SUFFIXES:
-.SUFFIXES: .out .o .po .so .s .S .c .cc .cpp .cxx .m .C .f .y .l
+.SUFFIXES: .out .o .po .So .s .S .c .cc .cpp .cxx .m .C .f .y .l
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@@ -54,7 +54,7 @@ STRIP?=	-s
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-.c.so:
+.c.So:
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
@@ -69,7 +69,7 @@ STRIP?=	-s
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-.cc.so .C.so .cpp.so .cxx.so:
+.cc.So .C.So .cpp.So .cxx.So:
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
@@ -84,7 +84,7 @@ STRIP?=	-s
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-.f.so:
+.f.So:
 	${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
@@ -99,7 +99,7 @@ STRIP?=	-s
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-.m.so:
+.m.So:
 	${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
@@ -116,7 +116,7 @@ STRIP?=	-s
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-.s.so:
+.s.So:
 	${CC} -x assembler-with-cpp -fpic -DPIC ${CFLAGS:M-[BID]*} ${AINC} -c \
 	    ${.IMPSRC} -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@@ -132,7 +132,7 @@ STRIP?=	-s
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
-.S.so:
+.S.So:
 	${CC} -fpic -DPIC ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
@@ -187,7 +187,7 @@ lib${LIB}_p.a:: ${POBJS}
 LDDESTDIRENV?=	LIBRARY_PATH=${DESTDIR}${SHLIBDIR}:${DESTDIR}${LIBDIR}
 .endif
 
-SOBJS+= ${OBJS:.o=.so}
+SOBJS+= ${OBJS:.o=.So}
 
 .if !defined(NOPIC)
 .if ${OBJFORMAT} == aout
@@ -222,8 +222,8 @@ clean:	_SUBDIR
 	rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${CLEANFILES}
 	rm -f lib${LIB}.a # llib-l${LIB}.ln
 	rm -f ${POBJS} ${POBJS:S/$/.tmp/} lib${LIB}_p.a
-	rm -f ${SOBJS} ${SOBJS:S/$/.tmp/} lib${LIB}.so.* lib${LIB}.so \
-	    lib${LIB}_pic.a
+	rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} \
+	    lib${LIB}.so.* lib${LIB}.so lib${LIB}_pic.a
 .if defined(CLEANDIRS) && !empty(CLEANDIRS)
 	rm -rf ${CLEANDIRS}
 .endif
@@ -231,7 +231,7 @@ clean:	_SUBDIR
 
 _EXTRADEPEND:
 	@TMP=_depend$$$$; \
-	sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so:/' < ${DEPENDFILE} \
+	sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.So:/' < ${DEPENDFILE} \
 	    > $$TMP; \
 	mv $$TMP ${DEPENDFILE}
 .if !defined(NOEXTRADEPEND) && !defined(NOPIC)
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index b505986..99f6169 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.14 1998/12/07 22:36:53 imp Exp $
+#	$Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $
 #
 # Makefile for FreeBSD
 #
@@ -78,7 +78,7 @@ SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 .if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
@@ -124,9 +124,9 @@ symbols.sort: ${ALPHA}/alpha/symbols.raw
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
-hack.so: Makefile
+hack.So: Makefile
 	echo "void __elf_kld_hack() {}" > hack.c
-	${CC} -shared -nostdlib hack.c -o hack.so
+	${CC} -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index b505986..99f6169 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.14 1998/12/07 22:36:53 imp Exp $
+#	$Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $
 #
 # Makefile for FreeBSD
 #
@@ -78,7 +78,7 @@ SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 .if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
@@ -124,9 +124,9 @@ symbols.sort: ${ALPHA}/alpha/symbols.raw
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
-hack.so: Makefile
+hack.So: Makefile
 	echo "void __elf_kld_hack() {}" > hack.c
-	${CC} -shared -nostdlib hack.c -o hack.so
+	${CC} -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 1905403..e4e8fd30 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.132 1998/12/21 10:29:09 msmith Exp $
+#	$Id: Makefile.i386,v 1.133 1999/01/07 06:52:41 peter Exp $
 #
 # Makefile for FreeBSD
 #
@@ -95,7 +95,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 .endif
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -122,8 +122,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \
-	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
+	      kernel linterrs makelinks param.c setdefs.h \
+	      symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -147,9 +148,9 @@ locore.o: ${I386}/i386/locore.s assym.s
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
-hack.so: Makefile
+hack.So: Makefile
 	touch hack.c
-	${CC} -elf -shared -nostdlib hack.c -o hack.so
+	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index b62b6ff..527d6fa 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.48 1998/12/25 09:03:18 kato Exp $
+#	$Id: Makefile.pc98,v 1.49 1999/01/08 15:59:41 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -98,7 +98,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 .endif
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -125,8 +125,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \
-	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
+	      kernel linterrs makelinks param.c setdefs.h \
+	      symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -150,9 +151,9 @@ locore.o: ${I386}/i386/locore.s assym.s
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
-hack.so: Makefile
+hack.So: Makefile
 	touch hack.c
-	${CC} -elf -shared -nostdlib hack.c -o hack.so
+	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 1905403..e4e8fd30 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.132 1998/12/21 10:29:09 msmith Exp $
+#	$Id: Makefile.i386,v 1.133 1999/01/07 06:52:41 peter Exp $
 #
 # Makefile for FreeBSD
 #
@@ -95,7 +95,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 .endif
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -122,8 +122,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \
-	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
+	      kernel linterrs makelinks param.c setdefs.h \
+	      symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -147,9 +148,9 @@ locore.o: ${I386}/i386/locore.s assym.s
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
-hack.so: Makefile
+hack.So: Makefile
 	touch hack.c
-	${CC} -elf -shared -nostdlib hack.c -o hack.so
+	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 1905403..e4e8fd30 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.132 1998/12/21 10:29:09 msmith Exp $
+#	$Id: Makefile.i386,v 1.133 1999/01/07 06:52:41 peter Exp $
 #
 # Makefile for FreeBSD
 #
@@ -95,7 +95,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 .endif
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -122,8 +122,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \
-	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
+	      kernel linterrs makelinks param.c setdefs.h \
+	      symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -147,9 +148,9 @@ locore.o: ${I386}/i386/locore.s assym.s
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
-hack.so: Makefile
+hack.So: Makefile
 	touch hack.c
-	${CC} -elf -shared -nostdlib hack.c -o hack.so
+	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index b62b6ff..527d6fa 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.48 1998/12/25 09:03:18 kato Exp $
+#	$Id: Makefile.pc98,v 1.49 1999/01/08 15:59:41 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -98,7 +98,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 .endif
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.so
+	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -125,8 +125,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \
-	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
+	      kernel linterrs makelinks param.c setdefs.h \
+	      symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -150,9 +151,9 @@ locore.o: ${I386}/i386/locore.s assym.s
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
-hack.so: Makefile
+hack.So: Makefile
 	touch hack.c
-	${CC} -elf -shared -nostdlib hack.c -o hack.so
+	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif