Module Name:    src
Committed By:   christos
Date:           Tue Jun  5 00:57:47 UTC 2018

Modified Files:
        src/sys/lib/libkern: Makefile
        src/sys/lib/libsa: Makefile
        src/sys/lib/libz: Makefile

Log Message:
Use the standard build rules.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/lib/libkern/Makefile
cvs rdiff -u -r1.87 -r1.88 src/sys/lib/libsa/Makefile
cvs rdiff -u -r1.22 -r1.23 src/sys/lib/libz/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/lib/libkern/Makefile
diff -u src/sys/lib/libkern/Makefile:1.100 src/sys/lib/libkern/Makefile:1.101
--- src/sys/lib/libkern/Makefile:1.100	Tue Mar 22 04:25:23 2016
+++ src/sys/lib/libkern/Makefile	Mon Jun  4 20:57:47 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.100 2016/03/22 08:25:23 mrg Exp $
+#	$NetBSD: Makefile,v 1.101 2018/06/05 00:57:47 christos Exp $
 
 LIB=		kern
 NOPIC=		# defined
@@ -17,15 +17,9 @@ libinstall::
 .undef DESTDIR
 .include <bsd.lib.mk>
 
-lib${LIB}.o:: ${OBJS:O}
-	@echo building standard ${LIB} library
-	@rm -f lib${LIB}.o
-	@${LD} -r -o lib${LIB}.o `NM=${NM} ${LORDER} ${OBJS} | ${TSORT}`
-
-lib${LIB}.po:: ${POBJS:O}
-	@echo building profiled ${LIB} library
-	@rm -f lib${LIB}.po
-	@${LD} -r -o lib${LIB}.po `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
+lib${LIB}.o:: ${OBJS:O} __buildstdlib
+
+lib${LIB}.po:: ${POBJS:O} __buildproflib
 
 showsources: ${SRCS:O}
 	@echo ${.ALLSRC}

Index: src/sys/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.87 src/sys/lib/libsa/Makefile:1.88
--- src/sys/lib/libsa/Makefile:1.87	Tue Mar 22 04:25:23 2016
+++ src/sys/lib/libsa/Makefile	Mon Jun  4 20:57:47 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.87 2016/03/22 08:25:23 mrg Exp $
+#	$NetBSD: Makefile,v 1.88 2018/06/05 00:57:47 christos Exp $
 
 LIB=	sa
 LIBISPRIVATE?= yes
@@ -79,10 +79,7 @@ SRCS+=	ufs.c
 
 .include <bsd.lib.mk>
 
-lib${LIB}.o:: ${OBJS:O}
-	@echo building standard ${LIB} library
-	@rm -f lib${LIB}.o
-	@${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
+lib${LIB}.o:: ${OBJS:O} __buildstdlib
 
 CPPFLAGS+=	-Wno-pointer-sign
 

Index: src/sys/lib/libz/Makefile
diff -u src/sys/lib/libz/Makefile:1.22 src/sys/lib/libz/Makefile:1.23
--- src/sys/lib/libz/Makefile:1.22	Tue Mar 22 04:25:23 2016
+++ src/sys/lib/libz/Makefile	Mon Jun  4 20:57:47 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2016/03/22 08:25:23 mrg Exp $
+#	$NetBSD: Makefile,v 1.23 2018/06/05 00:57:47 christos Exp $
 
 LIB=	z
 LIBISPRIVATE=	yes
@@ -24,10 +24,7 @@ CLEANFILES+= lib${LIB}.o
 .undef DESTDIR
 .include <bsd.lib.mk>
 
-lib${LIB}.o:: ${OBJS:O}
-	@echo building standard ${LIB} library
-	@rm -f lib${LIB}.o
-	@${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
+lib${LIB}.o:: ${OBJS:O} __buildstdlib
 
 .if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
 COPTS.inftrees.c+=	-O0

Reply via email to