Bye, bye SHAREDSTRINGS.

Okay deraadt@, millert@

2 files changed, 2 insertions, 33 deletions

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 0fb22348ac0..d4ae3636815 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.README,v 1.36 2003/08/29 00:04:41 jolan Exp $
+#	$OpenBSD: bsd.README,v 1.37 2005/04/15 17:18:57 espie Exp $
 #	$NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #	@(#)bsd.README	5.1 (Berkeley) 5/11/90
 
@@ -383,10 +383,6 @@ DPADD		Additional dependencies for the program.  Usually used for
 			LIBZ		/usr/lib/libz.a
 			LIBARCH		arch-dependent stuff
 
-SHAREDSTRINGS	If defined, a new .c.o rule is used that results in shared
-		strings, using xstr(1). Note that this will not work with
-		parallel makes.
-
 STRIP		The flag passed to the install program to cause the binary
 		to be stripped.
 
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 243158ebe6f..1c97ce0abd0 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.prog.mk,v 1.43 2004/12/23 23:58:36 espie Exp $
+#	$OpenBSD: bsd.prog.mk,v 1.44 2005/04/15 17:18:57 espie Exp $
 #	$NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
 
@@ -77,33 +77,6 @@ LIBPC?=		${DESTDIR}/usr/lib/libpc.a
 LIBPLOT?=	${DESTDIR}/usr/lib/libplot.a
 LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv.a
 
-.if defined(SHAREDSTRINGS)
-CLEANFILES+=strings
-.c.o:
-	${CC} -E ${CFLAGS} ${.IMPSRC} | xstr -c -
-	@${CC} ${CFLAGS} -c x.c -o ${.TARGET}
-	@rm -f x.c
-
-.cc.o:
-	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
-	@mv -f x.c x.cc
-	@${CXX} ${CXXFLAGS} -c x.cc -o ${.TARGET}
-	@rm -f x.cc
-
-.C.o:
-	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
-	@mv -f x.c x.C
-	@${CXX} ${CXXFLAGS} -c x.C -o ${.TARGET}
-	@rm -f x.C
-
-.cxx.o:
-	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
-	@mv -f x.c x.cxx
-	@${CXX} ${CXXFLAGS} -c x.cxx -o ${.TARGET}
-	@rm -f x.cxx
-.endif
-
-
 .if defined(PROG)
 SRCS?=	${PROG}.c
 .  if !empty(SRCS:N*.h:N*.sh)