Tue Jun 5 00:57:47 2018 UTC ()
Use the standard build rules.


(christos)
diff -r1.100 -r1.101 src/sys/lib/libkern/Makefile
diff -r1.87 -r1.88 src/sys/lib/libsa/Makefile
diff -r1.22 -r1.23 src/sys/lib/libz/Makefile
cvs diff -r1.100 -r1.101 src/sys/lib/libkern/Makefile (expand / switch to unified diff)

--- src/sys/lib/libkern/Makefile 2016/03/22 08:25:23 1.100
+++ src/sys/lib/libkern/Makefile 2018/06/05 00:57:47 1.101
@@ -1,31 +1,25 @@ @@ -1,31 +1,25 @@
1# $NetBSD: Makefile,v 1.100 2016/03/22 08:25:23 mrg Exp $ 1# $NetBSD: Makefile,v 1.101 2018/06/05 00:57:47 christos Exp $
2 2
3LIB= kern 3LIB= kern
4NOPIC= # defined 4NOPIC= # defined
5LLIBS= # defined 5LLIBS= # defined
6 6
7.include "Makefile.libkern" 7.include "Makefile.libkern"
8.ifndef ARCHSUBDIR 8.ifndef ARCHSUBDIR
9.BEGIN: 9.BEGIN:
10 @echo no ARCHSUBDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU} 10 @echo no ARCHSUBDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU}
11 @false 11 @false
12.endif 12.endif
13 13
14# only needed during build 14# only needed during build
15libinstall:: 15libinstall::
16 16
17.undef DESTDIR 17.undef DESTDIR
18.include <bsd.lib.mk> 18.include <bsd.lib.mk>
19 19
20lib${LIB}.o:: ${OBJS:O} 20lib${LIB}.o:: ${OBJS:O} __buildstdlib
21 @echo building standard ${LIB} library 21
22 @rm -f lib${LIB}.o 22lib${LIB}.po:: ${POBJS:O} __buildproflib
23 @${LD} -r -o lib${LIB}.o `NM=${NM} ${LORDER} ${OBJS} | ${TSORT}` 
24 
25lib${LIB}.po:: ${POBJS:O} 
26 @echo building profiled ${LIB} library 
27 @rm -f lib${LIB}.po 
28 @${LD} -r -o lib${LIB}.po `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}` 
29 23
30showsources: ${SRCS:O} 24showsources: ${SRCS:O}
31 @echo ${.ALLSRC} 25 @echo ${.ALLSRC}
cvs diff -r1.87 -r1.88 src/sys/lib/libsa/Makefile (expand / switch to unified diff)

--- src/sys/lib/libsa/Makefile 2016/03/22 08:25:23 1.87
+++ src/sys/lib/libsa/Makefile 2018/06/05 00:57:47 1.88
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.87 2016/03/22 08:25:23 mrg Exp $ 1# $NetBSD: Makefile,v 1.88 2018/06/05 00:57:47 christos Exp $
2 2
3LIB= sa 3LIB= sa
4LIBISPRIVATE?= yes 4LIBISPRIVATE?= yes
5 5
6SA_USE_CREAD?= no # Read compressed kernels 6SA_USE_CREAD?= no # Read compressed kernels
7SA_INCLUDE_NET?= yes # Netboot via TFTP, NFS 7SA_INCLUDE_NET?= yes # Netboot via TFTP, NFS
8SA_USE_LOADFILE?= no # Generic executable loading support 8SA_USE_LOADFILE?= no # Generic executable loading support
9SA_ENABLE_LS_OP?= no # Filesystems ls operation 9SA_ENABLE_LS_OP?= no # Filesystems ls operation
10 10
11#DEBUGCPPFLAGS= -DBOOTP_DEBUG -DNETIF_DEBUG -DETHER_DEBUG -DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG -DARP_DEBUG -DNET_DEBUG -DDEBUG -DPARANOID 11#DEBUGCPPFLAGS= -DBOOTP_DEBUG -DNETIF_DEBUG -DETHER_DEBUG -DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG -DARP_DEBUG -DNET_DEBUG -DDEBUG -DPARANOID
12CPPFLAGS= -I${SADIR} ${SACPPFLAGS} ${SAMISCCPPFLAGS} \ 12CPPFLAGS= -I${SADIR} ${SACPPFLAGS} ${SAMISCCPPFLAGS} \
13 -DCOMPAT_UFS ${DEBUGCPPFLAGS} 13 -DCOMPAT_UFS ${DEBUGCPPFLAGS}
14 14
@@ -69,23 +69,20 @@ SRCS+= nfs.c tftp.c @@ -69,23 +69,20 @@ SRCS+= nfs.c tftp.c
69SRCS+= ffsv1.c ffsv2.c 69SRCS+= ffsv1.c ffsv2.c
70SRCS+= lfsv1.c lfsv2.c 70SRCS+= lfsv1.c lfsv2.c
71SRCS+= cd9660.c 71SRCS+= cd9660.c
72SRCS+= ustarfs.c 72SRCS+= ustarfs.c
73SRCS+= dosfs.c 73SRCS+= dosfs.c
74SRCS+= ext2fs.c 74SRCS+= ext2fs.c
75SRCS+= minixfs3.c 75SRCS+= minixfs3.c
76SRCS+= fnmatch.c 76SRCS+= fnmatch.c
77# for historic compatibility ufs == ffsv1 77# for historic compatibility ufs == ffsv1
78SRCS+= ufs.c 78SRCS+= ufs.c
79 79
80.include <bsd.lib.mk> 80.include <bsd.lib.mk>
81 81
82lib${LIB}.o:: ${OBJS:O} 82lib${LIB}.o:: ${OBJS:O} __buildstdlib
83 @echo building standard ${LIB} library 
84 @rm -f lib${LIB}.o 
85 @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort` 
86 83
87CPPFLAGS+= -Wno-pointer-sign 84CPPFLAGS+= -Wno-pointer-sign
88 85
89.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax" 86.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
90COPTS.bootp.c+= -O0 87COPTS.bootp.c+= -O0
91.endif 88.endif
cvs diff -r1.22 -r1.23 src/sys/lib/libz/Makefile (expand / switch to unified diff)

--- src/sys/lib/libz/Makefile 2016/03/22 08:25:23 1.22
+++ src/sys/lib/libz/Makefile 2018/06/05 00:57:47 1.23
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1# $NetBSD: Makefile,v 1.22 2016/03/22 08:25:23 mrg Exp $ 1# $NetBSD: Makefile,v 1.23 2018/06/05 00:57:47 christos Exp $
2 2
3LIB= z 3LIB= z
4LIBISPRIVATE= yes 4LIBISPRIVATE= yes
5 5
6ZDISTDIR:=${.PARSEDIR}/../../../common/dist/zlib 6ZDISTDIR:=${.PARSEDIR}/../../../common/dist/zlib
7 7
8CPPFLAGS+= -I${ZDISTDIR} ${ZCPPFLAGS} ${ZMISCCPPFLAGS} 8CPPFLAGS+= -I${ZDISTDIR} ${ZCPPFLAGS} ${ZMISCCPPFLAGS}
9 9
10.PATH.c: ${ZDISTDIR} ${.PARSEDIR} 10.PATH.c: ${ZDISTDIR} ${.PARSEDIR}
11 11
12# files to be copied down from libz. 12# files to be copied down from libz.
13LIBZSRCS= adler32.c compress.c deflate.c infback.c inffast.c \ 13LIBZSRCS= adler32.c compress.c deflate.c infback.c inffast.c \
14 inflate.c inftrees.c trees.c uncompr.c 14 inflate.c inftrees.c trees.c uncompr.c
15LIBZHDRS= deflate.h inffast.h inffixed.h inflate.h inftrees.h \ 15LIBZHDRS= deflate.h inffast.h inffixed.h inflate.h inftrees.h \
16 trees.h zconf.h zlib.h 16 trees.h zconf.h zlib.h
17 17
18# Other stuff 18# Other stuff
19SRCS= ${LIBZSRCS} zalloc.c 19SRCS= ${LIBZSRCS} zalloc.c
20 20
21# Files to clean up 21# Files to clean up
22CLEANFILES+= lib${LIB}.o 22CLEANFILES+= lib${LIB}.o
23 23
24.undef DESTDIR 24.undef DESTDIR
25.include <bsd.lib.mk> 25.include <bsd.lib.mk>
26 26
27lib${LIB}.o:: ${OBJS:O} 27lib${LIB}.o:: ${OBJS:O} __buildstdlib
28 @echo building standard ${LIB} library 
29 @rm -f lib${LIB}.o 
30 @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort` 
31 28
32.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax" 29.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
33COPTS.inftrees.c+= -O0 30COPTS.inftrees.c+= -O0
34.endif 31.endif