Sat Jan 23 21:22:50 2016 UTC ()
Define _KERNTYPES for things that need it.


(christos)
diff -r1.3 -r1.4 src/external/bsd/ipf/bin/ipftest/Makefile
diff -r1.5 -r1.6 src/external/bsd/iscsi/initiator/Makefile
diff -r1.1 -r1.2 src/external/bsd/libproc/Makefile.inc
diff -r1.9 -r1.10 src/external/bsd/top/bin/Makefile
diff -r1.2 -r1.3 src/external/cddl/osnet/Makefile.inc
diff -r1.3 -r1.4 src/external/cddl/osnet/lib/Makefile.inc
diff -r1.1 -r1.2 src/external/cddl/osnet/sbin/Makefile.inc
diff -r1.1 -r1.2 src/external/cddl/osnet/usr.bin/Makefile.inc
diff -r1.1 -r1.2 src/external/cddl/osnet/usr.sbin/Makefile.inc
diff -r1.29 -r1.30 src/lib/libarch/Makefile
diff -r1.6 -r1.7 src/lib/libkern/Makefile
diff -r1.3 -r1.4 src/lib/libp2k/Makefile
diff -r1.10 -r1.11 src/lib/libperfuse/Makefile
diff -r1.25 -r1.26 src/lib/libpuffs/Makefile
diff -r1.9 -r1.10 src/lib/librefuse/Makefile
diff -r1.10 -r1.11 src/lib/librumpclient/Makefile
diff -r1.16 -r1.17 src/lib/librumphijack/Makefile
diff -r1.23 -r1.24 src/lib/librumpuser/Makefile
diff -r1.7 -r1.8 src/lib/libukfs/Makefile
diff -r1.129 -r1.130 src/libexec/ld.elf_so/Makefile
diff -r1.21 -r1.22 src/libexec/rpc.rstatd/Makefile
diff -r1.2 -r1.3 src/sbin/dkscan_bsdlabel/Makefile
diff -r1.8 -r1.9 src/sbin/fsirand/Makefile
diff -r1.31 -r1.32 src/sbin/mount/Makefile
diff -r1.25 -r1.26 src/sbin/mount_portal/Makefile
diff -r1.1 -r1.2 src/sbin/mount_puffs/Makefile
diff -r1.293 -r1.294 src/share/mk/bsd.prog.mk
diff -r1.67 -r1.68 src/sys/arch/i386/stand/boot/Makefile.boot
diff -r1.28 -r1.29 src/sys/arch/i386/stand/dosboot/Makefile
diff -r1.22 -r1.23 src/sys/arch/i386/stand/pxeboot/Makefile
diff -r1.1 -r1.2 src/tests/dev/Makefile.inc
diff -r1.4 -r1.5 src/tests/dev/audio/Makefile
diff -r1.2 -r1.3 src/tests/dev/dm/Makefile
diff -r1.5 -r1.6 src/tests/dev/md/Makefile
diff -r1.6 -r1.7 src/tests/dev/scsipi/Makefile
diff -r1.3 -r1.4 src/tests/dev/sysmon/Makefile
diff -r1.1 -r1.2 src/tests/fs/Makefile.inc
diff -r0 -r1.1 src/tests/fs/nfs/Makefile.inc
diff -r1.4 -r1.5 src/tests/fs/puffs/h_dtfs/Makefile
diff -r1.8 -r1.9 src/tests/include/sys/Makefile
diff -r1.37 -r1.38 src/tests/kernel/Makefile
diff -r1.2 -r1.3 src/tests/kernel/tty/Makefile
diff -r1.39 -r1.40 src/tests/lib/libc/sys/Makefile
diff -r1.5 -r1.6 src/tests/lib/librumpclient/Makefile
diff -r1.3 -r1.4 src/tests/lib/semaphore/pthread/Makefile
diff -r1.11 -r1.12 src/tests/modules/Makefile
diff -r1.1 -r1.2 src/tests/modules/Makefile.inc
diff -r1.1 -r1.2 src/tests/net/Makefile.inc
diff -r1.1 -r1.2 src/tests/rump/Makefile.inc
diff -r1.31 -r1.32 src/usr.bin/kdump/Makefile
diff -r1.29 -r1.30 src/usr.bin/ktruss/Makefile
diff -r1.6 -r1.7 src/usr.bin/ldd/Makefile.inc
diff -r1.6 -r1.7 src/usr.bin/pmap/Makefile
diff -r1.7 -r1.8 src/usr.bin/rump_allserver/Makefile
diff -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/Makefile
diff -r1.1 -r1.2 src/usr.bin/rump_halt/Makefile
diff -r1.8 -r1.9 src/usr.bin/rump_server/Makefile
diff -r1.37 -r1.38 src/usr.bin/systat/Makefile
diff -r1.6 -r1.7 src/usr.sbin/Makefile.inc
diff -r1.5 -r1.6 src/usr.sbin/acpitools/acpidump/Makefile
diff -r1.3 -r1.4 src/usr.sbin/acpitools/amldb/Makefile
diff -r1.7 -r1.8 src/usr.sbin/cpuctl/Makefile
diff -r1.5 -r1.6 src/usr.sbin/perfused/Makefile
diff -r1.14 -r1.15 src/usr.sbin/puffs/Makefile.inc
cvs diff -r1.3 -r1.4 src/external/bsd/ipf/bin/ipftest/Makefile (expand / switch to unified diff)

--- src/external/bsd/ipf/bin/ipftest/Makefile 2015/01/17 11:25:30 1.3
+++ src/external/bsd/ipf/bin/ipftest/Makefile 2016/01/23 21:22:45 1.4
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.3 2015/01/17 11:25:30 martin Exp $ 1# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:45 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= ipftest 5PROG= ipftest
6SRCS= ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c ip_nat6.c \ 6SRCS= ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c ip_nat6.c \
7 ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \ 7 ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
8 ip_dstlist.c ip_pool.c ip_sync.c \ 8 ip_dstlist.c ip_pool.c ip_sync.c \
9 ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \ 9 ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
10 ipf_l.c ipnat_y.c ipnat_l.c radix_ipf.c bpf_filter.c 10 ipf_l.c ipnat_y.c ipnat_l.c radix_ipf.c bpf_filter.c
11MAN= ipftest.1 11MAN= ipftest.1
12 12
13CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \ 13CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \
14 -DIPFILTER_SYNC -DIPFILTER_CKSUM \ 14 -DIPFILTER_SYNC -DIPFILTER_CKSUM \
15 -I. 15 -I. -D_KERNTYPES
16 16
17COPTS.radix.c= -Wno-error 17COPTS.radix.c= -Wno-error
18COPTS+= -fno-strict-aliasing 18COPTS+= -fno-strict-aliasing
19 19
20.PATH: ${NETBSDSRCDIR}/sys/external/bsd/ipf/netinet 20.PATH: ${NETBSDSRCDIR}/sys/external/bsd/ipf/netinet
21 21
22DPSRCS+= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h 22DPSRCS+= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
23 23
24CLEANFILES+= ipf_y.c ipf_y.h 24CLEANFILES+= ipf_y.c ipf_y.h
25CLEANFILES+= ipf_l.c ipf_l.h 25CLEANFILES+= ipf_l.c ipf_l.h
26CLEANFILES+= ipf.tab.c ipf.tab.h 26CLEANFILES+= ipf.tab.c ipf.tab.h
27CLEANFILES+= ipnat_y.c ipnat_y.h 27CLEANFILES+= ipnat_y.c ipnat_y.h
28CLEANFILES+= ipnat_l.c ipnat_l.h 28CLEANFILES+= ipnat_l.c ipnat_l.h
cvs diff -r1.5 -r1.6 src/external/bsd/iscsi/initiator/Makefile (expand / switch to unified diff)

--- src/external/bsd/iscsi/initiator/Makefile 2011/08/17 09:24:23 1.5
+++ src/external/bsd/iscsi/initiator/Makefile 2016/01/23 21:22:45 1.6
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.5 2011/08/17 09:24:23 christos Exp $ 1# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:45 christos Exp $
2 2
3.sinclude "${.CURDIR}/../Makefile.inc" 3.sinclude "${.CURDIR}/../Makefile.inc"
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7USE_FORT?=yes # network client/local server 7USE_FORT?=yes # network client/local server
8 8
9ISCSIDIST= ${.CURDIR}/../dist 9ISCSIDIST= ${.CURDIR}/../dist
10.PATH: ${ISCSIDIST}/src/initiator 10.PATH: ${ISCSIDIST}/src/initiator
11 11
12PROG=iscsi-initiator 12PROG=iscsi-initiator
13SRCS=iscsi-initiator.c virtdir.c libkmod.c 13SRCS=iscsi-initiator.c virtdir.c libkmod.c
14LDADD+= -lrefuse -liscsi -lpuffs 14LDADD+= -lrefuse -liscsi -lpuffs
15DPADD+= ${LIBREFUSE} ${LIBISCSI} ${LIBPUFFS} 15DPADD+= ${LIBREFUSE} ${LIBISCSI} ${LIBPUFFS}
16CPPFLAGS+= -I${ISCSIDIST}/include 16CPPFLAGS+= -I${ISCSIDIST}/include -D_KERNTYPES
17CPPFLAGS+= -pthread 17CPPFLAGS+= -pthread
18LDFLAGS+= -pthread 18LDFLAGS+= -pthread
19MAN=iscsi-initiator.8 19MAN=iscsi-initiator.8
20WARNS=4 20WARNS=4
21 21
22.ifdef MODULAR_KERNEL 22.ifdef MODULAR_KERNEL
23CPPFLAGS+= -DUSE_LIBKMOD 23CPPFLAGS+= -DUSE_LIBKMOD
24LDADD+= -lprop 24LDADD+= -lprop
25DPADD+= ${LIBPROP} 25DPADD+= ${LIBPROP}
26.endif 26.endif
27 27
28.include <bsd.prog.mk> 28.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 src/external/bsd/libproc/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/libproc/Makefile.inc 2015/09/24 14:12:48 1.1
+++ src/external/bsd/libproc/Makefile.inc 2016/01/23 21:22:45 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: Makefile.inc,v 1.1 2015/09/24 14:12:48 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:45 christos Exp $
2 2
3LIBPROCDIR:= ${.PARSEDIR}/dist 3LIBPROCDIR:= ${.PARSEDIR}/dist
 4CPPFLAGS+= -D_KERNTYPES
cvs diff -r1.9 -r1.10 src/external/bsd/top/bin/Makefile (expand / switch to unified diff)

--- src/external/bsd/top/bin/Makefile 2013/03/21 21:43:22 1.9
+++ src/external/bsd/top/bin/Makefile 2016/01/23 21:22:45 1.10
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.9 2013/03/21 21:43:22 christos Exp $ 1# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:45 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= top 5PROG= top
6BINDIR= /usr/bin 6BINDIR= /usr/bin
7 7
8TOPDIR=${.CURDIR}/../dist 8TOPDIR=${.CURDIR}/../dist
9.PATH: ${TOPDIR} ${TOPDIR}/machine 9.PATH: ${TOPDIR} ${TOPDIR}/machine
10 10
11WARNS= 4 11WARNS= 4
12CWARNFLAGS+= -Wno-missing-noreturn 12CWARNFLAGS+= -Wno-missing-noreturn
13 13
14CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I. 14CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I. -D_KERNTYPES
15SRCS= color.c commands.c display.c hash.c screen.c \ 15SRCS= color.c commands.c display.c hash.c screen.c \
16 top.c username.c utils.c version.c m_netbsd.c 16 top.c username.c utils.c version.c m_netbsd.c
17DPSRCS+=sigdesc.h config.h 17DPSRCS+=sigdesc.h config.h
18 18
19LDADD+= -lterminfo -lm -lkvm -lutil 19LDADD+= -lterminfo -lm -lkvm -lutil
20DPADD+= ${LIBTERMINFO} ${LIBM} ${LIBKVM} ${LIBUTIL} 20DPADD+= ${LIBTERMINFO} ${LIBM} ${LIBKVM} ${LIBUTIL}
21 21
22sigdesc.h: ${TOPDIR}/sigconv.awk ${DESTDIR}/usr/include/sys/signal.h 22sigdesc.h: ${TOPDIR}/sigconv.awk ${DESTDIR}/usr/include/sys/signal.h
23 ${_MKTARGET_CREATE} 23 ${_MKTARGET_CREATE}
24 ${TOOL_AWK} -f ${TOPDIR}/sigconv.awk \ 24 ${TOOL_AWK} -f ${TOPDIR}/sigconv.awk \
25 ${DESTDIR}/usr/include/sys/signal.h > ${.TARGET} 25 ${DESTDIR}/usr/include/sys/signal.h > ${.TARGET}
26CLEANFILES+= sigdesc.h top.1 config.h 26CLEANFILES+= sigdesc.h top.1 config.h
27 27
cvs diff -r1.2 -r1.3 src/external/cddl/osnet/Makefile.inc (expand / switch to unified diff)

--- src/external/cddl/osnet/Makefile.inc 2015/02/07 20:30:03 1.2
+++ src/external/cddl/osnet/Makefile.inc 2016/01/23 21:22:45 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1# $FreeBSD: src/cddl/Makefile.inc,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $ 1# $FreeBSD: src/cddl/Makefile.inc,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
2 2
3WARNS?=5 3WARNS?=5
4OSNETDIR= ${NETBSDSRCDIR}/external/cddl/osnet 4OSNETDIR= ${NETBSDSRCDIR}/external/cddl/osnet
5 5
6OPENSOLARIS_USR_DISTDIR=${OSNETDIR}/dist 6OPENSOLARIS_USR_DISTDIR=${OSNETDIR}/dist
7OPENSOLARIS_SYS_DISTDIR=${OSNETDIR}/dist 7OPENSOLARIS_SYS_DISTDIR=${OSNETDIR}/dist
8CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare 8CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare -D_KERNTYPES
cvs diff -r1.3 -r1.4 src/external/cddl/osnet/lib/Makefile.inc (expand / switch to unified diff)

--- src/external/cddl/osnet/lib/Makefile.inc 2010/02/21 01:46:34 1.3
+++ src/external/cddl/osnet/lib/Makefile.inc 2016/01/23 21:22:45 1.4
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
1# $NetBSD: Makefile.inc,v 1.3 2010/02/21 01:46:34 darran Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2016/01/23 21:22:45 christos Exp $
2 2
3MKLINT=no 3MKLINT=no
4MKLINTLIB=no 4MKLINTLIB=no
 5CPPFLAGS+= -D_KERNTYPES
cvs diff -r1.1 -r1.2 src/external/cddl/osnet/sbin/Makefile.inc (expand / switch to unified diff)

--- src/external/cddl/osnet/sbin/Makefile.inc 2009/08/07 20:57:56 1.1
+++ src/external/cddl/osnet/sbin/Makefile.inc 2016/01/23 21:22:45 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:56 haad Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:45 christos Exp $
2 2
3BINDIR?= /sbin 3BINDIR?= /sbin
 4CPPFLAGS+= -D_KERNTYPES
cvs diff -r1.1 -r1.2 src/external/cddl/osnet/usr.bin/Makefile.inc (expand / switch to unified diff)

--- src/external/cddl/osnet/usr.bin/Makefile.inc 2009/08/07 20:57:59 1.1
+++ src/external/cddl/osnet/usr.bin/Makefile.inc 2016/01/23 21:22:46 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:59 haad Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:46 christos Exp $
2 2
3BINDIR?= /usr/bin 3BINDIR?= /usr/bin
 4CPPFLAGS+= -D_KERNTYPES
cvs diff -r1.1 -r1.2 src/external/cddl/osnet/usr.sbin/Makefile.inc (expand / switch to unified diff)

--- src/external/cddl/osnet/usr.sbin/Makefile.inc 2009/08/07 20:57:59 1.1
+++ src/external/cddl/osnet/usr.sbin/Makefile.inc 2016/01/23 21:22:46 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:59 haad Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:46 christos Exp $
2 2
3BINDIR?= /usr/sbin 3BINDIR?= /usr/sbin
 4CPPFLAGS+= -D_KERNTYPES
cvs diff -r1.29 -r1.30 src/lib/libarch/Makefile (expand / switch to unified diff)

--- src/lib/libarch/Makefile 2015/06/08 04:08:30 1.29
+++ src/lib/libarch/Makefile 2016/01/23 21:22:46 1.30
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.29 2015/06/08 04:08:30 matt Exp $ 1# $NetBSD: Makefile,v 1.30 2016/01/23 21:22:46 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# These should always be a MACHINE_CPU value 5# These should always be a MACHINE_CPU value
6ARCHDIRS= alpha arm i386 m68k sparc x86_64 6ARCHDIRS= alpha arm i386 m68k sparc x86_64
7 7
8.for arch in ${ARCHDIRS} 8.for arch in ${ARCHDIRS}
9.include "${.CURDIR}/${arch}/Makefile.inc" 9.include "${.CURDIR}/${arch}/Makefile.inc"
10.PATH: ${.CURDIR}/${arch} 10.PATH: ${.CURDIR}/${arch}
11.endfor 11.endfor
12 12
13OBJS+= ${ASM} 13OBJS+= ${ASM}
14POBJS+= ${ASM:.o=.po} 14POBJS+= ${ASM:.o=.po}
15CLEANFILES+= ${ASM} ${POBJS} 15CLEANFILES+= ${ASM} ${POBJS}
 16CPPFLAGS+= -D_KERNTYPES
16 17
17LIBC_MACHINE_CPU?= ${MACHINE_CPU} 18LIBC_MACHINE_CPU?= ${MACHINE_CPU}
18 19
19# Build the library if SRCS is now defined ... 20# Build the library if SRCS is now defined ...
20.if defined(SRCS) 21.if defined(SRCS)
21.if defined(MLIBDIR) && ${LIBC_MACHINE_CPU} != "arm" 22.if defined(MLIBDIR) && ${LIBC_MACHINE_CPU} != "arm"
22LIB= ${MLIBDIR} 23LIB= ${MLIBDIR}
23.else 24.else
24LIB= ${LIBC_MACHINE_CPU} 25LIB= ${LIBC_MACHINE_CPU}
25.endif 26.endif
26SHLIB_VERSION_FILE= ${.CURDIR}/${LIB}/shlib_version 27SHLIB_VERSION_FILE= ${.CURDIR}/${LIB}/shlib_version
27 28
28.include <bsd.lib.mk> 29.include <bsd.lib.mk>
cvs diff -r1.6 -r1.7 src/lib/libkern/Makefile (expand / switch to unified diff)

--- src/lib/libkern/Makefile 2013/08/25 14:20:30 1.6
+++ src/lib/libkern/Makefile 2016/01/23 21:22:46 1.7
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.6 2013/08/25 14:20:30 matt Exp $ 1# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:46 christos Exp $
2 2
3.include <bsd.obj.mk> # Pull in OBJDIR name rules. 3.include <bsd.obj.mk> # Pull in OBJDIR name rules.
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5.include <bsd.klinks.mk> 5.include <bsd.klinks.mk>
6 6
7LIBISPRIVATE?= yes 7LIBISPRIVATE?= yes
8LIB= kern 8LIB= kern
9DBG= -Os 9DBG= -Os
10 10
11S= ${NETBSDSRCDIR}/sys 11S= ${NETBSDSRCDIR}/sys
12CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S} -I${S}/arch 12CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S} -I${S}/arch
13 13
14CPPFLAGS+= -D_STANDALONE 14CPPFLAGS+= -D_STANDALONE
15 15
16COPTS+= -ffreestanding 16COPTS+= -ffreestanding
17COPTS+= -fno-stack-protector 17COPTS+= -fno-stack-protector
18COPTS+= -fno-unwind-tables 18COPTS+= -fno-unwind-tables
19CWARNFLAGS+= -Werror 19CWARNFLAGS+= -Werror
20CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith 20CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 21CPPFLAGS+= -D_KERNTYPES
21 22
22### find out what to use for libkern 23### find out what to use for libkern
23KERN_AS= library 24KERN_AS= library
24KERNDIR= ${S}/lib/libkern 25KERNDIR= ${S}/lib/libkern
25 26
26.include "${KERNDIR}/Makefile.libkern" 27.include "${KERNDIR}/Makefile.libkern"
27.ifndef ARCHSUBDIR 28.ifndef ARCHSUBDIR
28.BEGIN: 29.BEGIN:
29 @echo no ARCHSUBDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU} 30 @echo no ARCHSUBDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU}
30 @false 31 @false
31.endif 32.endif
32 33
33.include <bsd.lib.mk> 34.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/lib/libp2k/Makefile (expand / switch to unified diff)

--- src/lib/libp2k/Makefile 2013/09/11 23:04:10 1.3
+++ src/lib/libp2k/Makefile 2016/01/23 21:22:46 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:46 christos Exp $
2# 2#
3 3
4LIB= p2k 4LIB= p2k
5LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs \ 5LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs \
6 rump ${.CURDIR}/../librump \ 6 rump ${.CURDIR}/../librump \
7 rumpvfs ${.CURDIR}/../librumpvfs \ 7 rumpvfs ${.CURDIR}/../librumpvfs \
8 ukfs ${.CURDIR}/../libukfs 8 ukfs ${.CURDIR}/../libukfs
9 9
10INCS= p2k.h 10INCS= p2k.h
11INCSDIR= /usr/include/rump 11INCSDIR= /usr/include/rump
 12CPPFLAGS+= -D_KERNTYPES
12 13
13SRCS= p2k.c 14SRCS= p2k.c
14MAN= p2k.3 15MAN= p2k.3
15 16
16.include <bsd.lib.mk> 17.include <bsd.lib.mk>
cvs diff -r1.10 -r1.11 src/lib/libperfuse/Makefile (expand / switch to unified diff)

--- src/lib/libperfuse/Makefile 2012/09/06 16:39:07 1.10
+++ src/lib/libperfuse/Makefile 2016/01/23 21:22:46 1.11
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.10 2012/09/06 16:39:07 riz Exp $ 1# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
2 2
3LIB= perfuse 3LIB= perfuse
4LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs 4LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
5 5
6PERFUSE_OPT_DEBUG_FLAGS= -g -DPERFUSE_DEBUG 6PERFUSE_OPT_DEBUG_FLAGS= -g -DPERFUSE_DEBUG
7 7
8CWARNFLAGS.clang+= -Wno-format-security 8CWARNFLAGS.clang+= -Wno-format-security
9 9
10#CFLAGS+= ${PERFUSE_OPT_DEBUG_FLAGS} 10#CFLAGS+= ${PERFUSE_OPT_DEBUG_FLAGS}
11CPPFLAGS+= -I${.CURDIR}  11CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
12CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libpuffs  12CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libpuffs
13SRCS= perfuse.c ops.c subr.c debug.c 13SRCS= perfuse.c ops.c subr.c debug.c
14MAN= libperfuse.3 14MAN= libperfuse.3
15WARNS?= 5 15WARNS?= 5
16INCS= perfuse.h 16INCS= perfuse.h
17INCSDIR= /usr/include 17INCSDIR= /usr/include
18 18
19.include <bsd.lib.mk> 19.include <bsd.lib.mk>
cvs diff -r1.25 -r1.26 src/lib/libpuffs/Makefile (expand / switch to unified diff)

--- src/lib/libpuffs/Makefile 2012/03/21 05:37:43 1.25
+++ src/lib/libpuffs/Makefile 2016/01/23 21:22:46 1.26
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.25 2012/03/21 05:37:43 matt Exp $ 1# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:46 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6USE_FORT?= yes # data-driven bugs? 6USE_FORT?= yes # data-driven bugs?
7 7
8WARNS?= 5 8WARNS?= 5
9 9
10LIB= puffs 10LIB= puffs
11 11
12SRCS= puffs.c callcontext.c creds.c dispatcher.c flush.c \ 12SRCS= puffs.c callcontext.c creds.c dispatcher.c flush.c \
13 framebuf.c null.c opdump.c paths.c pnode.c requests.c \ 13 framebuf.c null.c opdump.c paths.c pnode.c requests.c \
14 subr.c suspend.c 14 subr.c suspend.c
15MAN= puffs.3 puffs_cc.3 puffs_cred.3 puffs_flush.3 \ 15MAN= puffs.3 puffs_cc.3 puffs_cred.3 puffs_flush.3 \
16 puffs_framebuf.3 puffs_node.3 puffs_ops.3 puffs_path.3 16 puffs_framebuf.3 puffs_node.3 puffs_ops.3 puffs_path.3
17INCS= puffs.h puffsdump.h 17INCS= puffs.h puffsdump.h
18INCSDIR= /usr/include 18INCSDIR= /usr/include
 19CPPFLAGS+= -D_KERNTYPES
19LINTFLAGS+=-S -w 20LINTFLAGS+=-S -w
20 21
21.include <bsd.lib.mk> 22.include <bsd.lib.mk>
cvs diff -r1.9 -r1.10 src/lib/librefuse/Makefile (expand / switch to unified diff)

--- src/lib/librefuse/Makefile 2012/03/21 05:37:43 1.9
+++ src/lib/librefuse/Makefile 2016/01/23 21:22:46 1.10
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.9 2012/03/21 05:37:43 matt Exp $ 1# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:46 christos Exp $
2 2
3USE_FORT?= yes # data driven bugs? 3USE_FORT?= yes # data driven bugs?
4 4
5LIB= refuse 5LIB= refuse
6LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs \ 6LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs \
7 pthread ${.CURDIR}/../libpthread 7 pthread ${.CURDIR}/../libpthread
8 8
9.ifdef DEBUG 9.ifdef DEBUG
10FUSE_OPT_DEBUG_FLAGS= -g -DFUSE_OPT_DEBUG 10FUSE_OPT_DEBUG_FLAGS= -g -DFUSE_OPT_DEBUG
11.endif 11.endif
12 12
13CFLAGS+= ${FUSE_OPT_DEBUG_FLAGS} 13CFLAGS+= ${FUSE_OPT_DEBUG_FLAGS}
 14CPPFLAGS+= -D_KERNTYPES
14SRCS= refuse.c refuse_opt.c 15SRCS= refuse.c refuse_opt.c
15MAN= refuse.3 16MAN= refuse.3
16WARNS?= 5 17WARNS?= 5
17INCS= fuse.h fuse_opt.h 18INCS= fuse.h fuse_opt.h
18INCSDIR= /usr/include 19INCSDIR= /usr/include
19 20
20.include <bsd.lib.mk> 21.include <bsd.lib.mk>
cvs diff -r1.10 -r1.11 src/lib/librumpclient/Makefile (expand / switch to unified diff)

--- src/lib/librumpclient/Makefile 2013/09/10 17:39:10 1.10
+++ src/lib/librumpclient/Makefile 2016/01/23 21:22:46 1.11
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.10 2013/09/10 17:39:10 pooka Exp $ 1# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
2# 2#
3 3
4.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern 4.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
5 5
6LIB= rumpclient 6LIB= rumpclient
7USE_SHLIBDIR= yes 7USE_SHLIBDIR= yes
8MAN= rumpclient.3 8MAN= rumpclient.3
9 9
10.include <bsd.own.mk> 10.include <bsd.own.mk>
11 11
12INCS= rumpclient.h 12INCS= rumpclient.h
13INCSDIR= /usr/include/rump 13INCSDIR= /usr/include/rump
14 14
15.for lib in ${RUMPCLIENT_EXTERNAL_DPLIBS} 15.for lib in ${RUMPCLIENT_EXTERNAL_DPLIBS}
16LIBDO.${lib}= _external 16LIBDO.${lib}= _external
17LIBDPLIBS+= ${lib} lib 17LIBDPLIBS+= ${lib} lib
18.endfor 18.endfor
19 19
20CPPFLAGS+= -DRUMP_CLIENT 20CPPFLAGS+= -DRUMP_CLIENT -D_KERNTYPES
21CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR} 21CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}
22CPPFLAGS+= -I${.CURDIR}/../librumpuser 22CPPFLAGS+= -I${.CURDIR}/../librumpuser
23SRCS= rumpclient.c 23SRCS= rumpclient.c
24SRCS+= rump_syscalls.c 24SRCS+= rump_syscalls.c
25 25
26CLEANFILES+= srcsys 26CLEANFILES+= srcsys
27 27
28COPTS.rump_syscalls.c+= -fno-strict-aliasing 28COPTS.rump_syscalls.c+= -fno-strict-aliasing
29 29
30.if !make(obj) && !make(clean) && !make(cleandir) 30.if !make(obj) && !make(clean) && !make(cleandir)
31.BEGIN: 31.BEGIN:
32 @rm -f srcsys 32 @rm -f srcsys
33 @ln -s ${NETBSDSRCDIR}/sys/sys srcsys 33 @ln -s ${NETBSDSRCDIR}/sys/sys srcsys
cvs diff -r1.16 -r1.17 src/lib/librumphijack/Makefile (expand / switch to unified diff)

--- src/lib/librumphijack/Makefile 2014/01/18 18:37:30 1.16
+++ src/lib/librumphijack/Makefile 2016/01/23 21:22:46 1.17
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.16 2014/01/18 18:37:30 tron Exp $ 1# $NetBSD: Makefile,v 1.17 2016/01/23 21:22:46 christos Exp $
2# 2#
3 3
4LIB= rumphijack 4LIB= rumphijack
5NOSTATICLIB= dlfun 5NOSTATICLIB= dlfun
6NOPROFILE= dlfun 6NOPROFILE= dlfun
7LIBDPLIBS+= pthread ${.CURDIR}/../libpthread \ 7LIBDPLIBS+= pthread ${.CURDIR}/../libpthread \
8 rumpclient ${.CURDIR}/../librumpclient 8 rumpclient ${.CURDIR}/../librumpclient
9MAN= rumphijack.3 9MAN= rumphijack.3
10 10
11SRCS= hijack.c hijackdlsym.c 11SRCS= hijack.c hijackdlsym.c
12 12
13CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT 13CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
14 14
15WARNS?= 5 15WARNS?= 5
16 16
17# make sure the compiler doesn't get clever, since we need 17# make sure the compiler doesn't get clever, since we need
18# a stack frame 18# a stack frame
19COPTS.hijackdlsym.c+= -O0 19COPTS.hijackdlsym.c+= -O0
20 20
21.include <bsd.lib.mk> 21.include <bsd.lib.mk>
22 22
23CPPFLAGS+= -U_FORTIFY_SOURCE 23CPPFLAGS+= -U_FORTIFY_SOURCE
cvs diff -r1.23 -r1.24 src/lib/librumpuser/Makefile (expand / switch to unified diff)

--- src/lib/librumpuser/Makefile 2014/11/09 17:39:37 1.23
+++ src/lib/librumpuser/Makefile 2016/01/23 21:22:46 1.24
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.23 2014/11/09 17:39:37 pooka Exp $ 1# $NetBSD: Makefile,v 1.24 2016/01/23 21:22:46 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6WARNS?= 5 6WARNS?= 5
7 7
8# rumpuser.h is in sys/rump for inclusion by kernel components 8# rumpuser.h is in sys/rump for inclusion by kernel components
9.PATH: ${.CURDIR}/../../sys/rump/include/rump 9.PATH: ${.CURDIR}/../../sys/rump/include/rump
10 10
11RUMPUSER_THREADS?=pthread 11RUMPUSER_THREADS?=pthread
12 12
13LIB= rumpuser 13LIB= rumpuser
14 14
15.if ${RUMPUSER_THREADS} == "pthread" 15.if ${RUMPUSER_THREADS} == "pthread"
16LIBDPLIBS+= pthread ${.CURDIR}/../libpthread 16LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
17.endif 17.endif
18.for lib in ${RUMPUSER_EXTERNAL_DPLIBS} 18.for lib in ${RUMPUSER_EXTERNAL_DPLIBS}
19LIBDO.${lib}= _external 19LIBDO.${lib}= _external
20LIBDPLIBS+= ${lib} lib 20LIBDPLIBS+= ${lib} lib
21.endfor 21.endfor
22CPPFLAGS+= -DLIBRUMPUSER 22CPPFLAGS+= -DLIBRUMPUSER -D_KERNTYPES
23#CPPFLAGS+= -D_DIAGNOSTIC 23#CPPFLAGS+= -D_DIAGNOSTIC
24 24
25 25
26.if ${RUMPUSER_THREADS} == "pthread" 26.if ${RUMPUSER_THREADS} == "pthread"
27SRCS= rumpuser.c rumpuser_pth.c rumpuser_bio.c 27SRCS= rumpuser.c rumpuser_pth.c rumpuser_bio.c
28SRCS+= rumpuser_sp.c 28SRCS+= rumpuser_sp.c
29.elif ${RUMPUSER_THREADS} == "none" 29.elif ${RUMPUSER_THREADS} == "none"
30SRCS= rumpuser.c rumpuser_pth_dummy.c rumpuser_bio.c 30SRCS= rumpuser.c rumpuser_pth_dummy.c rumpuser_bio.c
31SRCS+= rumpuser_sp.c 31SRCS+= rumpuser_sp.c
32.elif ${RUMPUSER_THREADS} == "fiber" 32.elif ${RUMPUSER_THREADS} == "fiber"
33.if defined(RUMP_CURLWP) 33.if defined(RUMP_CURLWP)
34.if ${RUMP_CURLWP} != "hypercall" 34.if ${RUMP_CURLWP} != "hypercall"
35.error Unsupported curlwp scheme for thread model: ${RUMP_CURLWP} 35.error Unsupported curlwp scheme for thread model: ${RUMP_CURLWP}
cvs diff -r1.7 -r1.8 src/lib/libukfs/Makefile (expand / switch to unified diff)

--- src/lib/libukfs/Makefile 2013/09/11 23:04:11 1.7
+++ src/lib/libukfs/Makefile 2016/01/23 21:22:47 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:11 joerg Exp $ 1# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:47 christos Exp $
2# 2#
3 3
4WARNS= 2 4WARNS= 2
5 5
6LIB= ukfs 6LIB= ukfs
7LIBDPLIBS+= rump ${.CURDIR}/../librump \ 7LIBDPLIBS+= rump ${.CURDIR}/../librump \
8 rumpvfs ${.CURDIR}/../librumpvfs \ 8 rumpvfs ${.CURDIR}/../librumpvfs \
9 pthread ${.CURDIR}/../libpthread 9 pthread ${.CURDIR}/../libpthread
10CPPFLAGS+= -I${.CURDIR} 10CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
11 11
12INCS= ukfs.h 12INCS= ukfs.h
13INCSDIR= /usr/include/rump 13INCSDIR= /usr/include/rump
14 14
15SRCS= ukfs.c ukfs_disklabel.c 15SRCS= ukfs.c ukfs_disklabel.c
16MAN= ukfs.3 16MAN= ukfs.3
17 17
18.include <bsd.lib.mk> 18.include <bsd.lib.mk>
cvs diff -r1.129 -r1.130 src/libexec/ld.elf_so/Makefile (expand / switch to unified diff)

--- src/libexec/ld.elf_so/Makefile 2014/09/19 17:43:33 1.129
+++ src/libexec/ld.elf_so/Makefile 2016/01/23 21:22:47 1.130
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.129 2014/09/19 17:43:33 matt Exp $ 1# $NetBSD: Makefile,v 1.130 2016/01/23 21:22:47 christos Exp $
2# 2#
3# NOTE: when changing ld.so, ensure that ldd still compiles. 3# NOTE: when changing ld.so, ensure that ldd still compiles.
4# 4#
5 5
6WARNS?=4 6WARNS?=4
7 7
8LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH} 8LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH}
9 9
10# This needs to be before bsd.init.mk 10# This needs to be before bsd.init.mk
11.if defined(BSD_MK_COMPAT_FILE) 11.if defined(BSD_MK_COMPAT_FILE)
12.include <${BSD_MK_COMPAT_FILE}> 12.include <${BSD_MK_COMPAT_FILE}>
13.endif 13.endif
14 14
@@ -81,27 +81,27 @@ SRCS+= stack_protector.c @@ -81,27 +81,27 @@ SRCS+= stack_protector.c
81SRCS+= exit.c 81SRCS+= exit.c
82 82
83errlist_concat.h: ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h 83errlist_concat.h: ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
84 ${TOOL_AWK} -v concat=1 -f ${.ALLSRC} > ${.TARGET}.tmp && \ 84 ${TOOL_AWK} -v concat=1 -f ${.ALLSRC} > ${.TARGET}.tmp && \
85 mv -f ${.TARGET}.tmp ${.TARGET} 85 mv -f ${.TARGET}.tmp ${.TARGET}
86 86
87xprintf.c: errlist_concat.h 87xprintf.c: errlist_concat.h
88 88
89CLEANFILES+= errlist_concat.h ${PROG}.map 89CLEANFILES+= errlist_concat.h ${PROG}.map
90 90
91BINDIR= ${SHLINKINSTALLDIR} 91BINDIR= ${SHLINKINSTALLDIR}
92 92
93CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\" 93CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
94CPPFLAGS+= -I${.CURDIR} -I. 94CPPFLAGS+= -I${.CURDIR} -I. -D_KERNTYPES
95CPPFLAGS+= -DRTLD_LOADER 95CPPFLAGS+= -DRTLD_LOADER
96CPPFLAGS+= -D_RTLD_SOURCE 96CPPFLAGS+= -D_RTLD_SOURCE
97CPPFLAGS+= -DCOMBRELOC 97CPPFLAGS+= -DCOMBRELOC
98#CPPFLAGS+= -DDEBUG 98#CPPFLAGS+= -DDEBUG
99#CPPFLAGS+= -DRTLD_DEBUG 99#CPPFLAGS+= -DRTLD_DEBUG
100#CPPFLAGS+= -DRTLD_DEBUG_RELOC 100#CPPFLAGS+= -DRTLD_DEBUG_RELOC
101.if !empty(LDELFSO_MACHINE_ARCH:Mearm*) 101.if !empty(LDELFSO_MACHINE_ARCH:Mearm*)
102CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libexecinfo 102CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libexecinfo
103.endif 103.endif
104#DBG= -g 104#DBG= -g
105COPTS+= -O3 105COPTS+= -O3
106 106
107.if ${MACHINE_CPU} != "m68k" && ${MACHINE_CPU} != "sh3" && ${MACHINE_ARCH} != "vax" 107.if ${MACHINE_CPU} != "m68k" && ${MACHINE_CPU} != "sh3" && ${MACHINE_ARCH} != "vax"
cvs diff -r1.21 -r1.22 src/libexec/rpc.rstatd/Makefile (expand / switch to unified diff)

--- src/libexec/rpc.rstatd/Makefile 2014/06/02 19:29:58 1.21
+++ src/libexec/rpc.rstatd/Makefile 2016/01/23 21:22:47 1.22
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.21 2014/06/02 19:29:58 joerg Exp $ 1# $NetBSD: Makefile,v 1.22 2016/01/23 21:22:47 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG = rpc.rstatd 5PROG = rpc.rstatd
6.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat 6.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat
7 7
8CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat 8CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -D_KERNTYPES
9SRCS = drvstats.c rstatd.c rstat_proc.c 9SRCS = drvstats.c rstatd.c rstat_proc.c
10MAN = rpc.rstatd.8 10MAN = rpc.rstatd.8
11MLINKS= rpc.rstatd.8 rstatd.8 11MLINKS= rpc.rstatd.8 rstatd.8
12 12
13DPADD= ${LIBRPCSVC} 13DPADD= ${LIBRPCSVC}
14LDADD= -lrpcsvc 14LDADD= -lrpcsvc
15 15
16.include <bsd.prog.mk> 16.include <bsd.prog.mk>
cvs diff -r1.2 -r1.3 src/sbin/dkscan_bsdlabel/Makefile (expand / switch to unified diff)

--- src/sbin/dkscan_bsdlabel/Makefile 2007/03/02 04:03:17 1.2
+++ src/sbin/dkscan_bsdlabel/Makefile 2016/01/23 21:22:47 1.3
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1# $NetBSD: Makefile,v 1.2 2007/03/02 04:03:17 riz Exp $ 1# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:47 christos Exp $
2 2
3PROG= dkscan_bsdlabel 3PROG= dkscan_bsdlabel
4MAN= dkscan_bsdlabel.8 4MAN= dkscan_bsdlabel.8
5 5
6CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dev/dkwedge 6CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dev/dkwedge -D_KERNTYPES
7SRCS= dkscan_bsdlabel.c dkscan_util.c 7SRCS= dkscan_bsdlabel.c dkscan_util.c
8 8
9LDADD+= -lutil 9LDADD+= -lutil
10 10
11.include <bsd.prog.mk> 11.include <bsd.prog.mk>
cvs diff -r1.8 -r1.9 src/sbin/fsirand/Makefile (expand / switch to unified diff)

--- src/sbin/fsirand/Makefile 2005/06/27 01:00:05 1.8
+++ src/sbin/fsirand/Makefile 2016/01/23 21:22:47 1.9
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2005/06/27 01:00:05 christos Exp $ 1# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:47 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= fsirand 5PROG= fsirand
6SRCS= fsirand.c ffs_bswap.c 6SRCS= fsirand.c ffs_bswap.c
7MAN= fsirand.8 7MAN= fsirand.8
8 8
9LDADD+= -lutil 9LDADD+= -lutil
 10CPPFLAGS+= -D_KERNTYPES
10 11
11.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs 12.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
12 13
13.include <bsd.prog.mk> 14.include <bsd.prog.mk>
cvs diff -r1.31 -r1.32 src/sbin/mount/Makefile (expand / switch to unified diff)

--- src/sbin/mount/Makefile 2012/04/07 05:58:55 1.31
+++ src/sbin/mount/Makefile 2016/01/23 21:22:47 1.32
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: Makefile,v 1.31 2012/04/07 05:58:55 christos Exp $ 1# $NetBSD: Makefile,v 1.32 2016/01/23 21:22:47 christos Exp $
2# @(#)Makefile 8.6 (Berkeley) 5/8/95 2# @(#)Makefile 8.6 (Berkeley) 5/8/95
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
 6CPPFLAGS+= -D_KERNTYPES
6PROG= mount 7PROG= mount
7MAN= mount.8 8MAN= mount.8
8SRCS= mount.c vfslist.c 9SRCS= mount.c vfslist.c
9LDADD+= -lutil 10LDADD+= -lutil
10DPADD+= ${LIBUTIL} 11DPADD+= ${LIBUTIL}
11 12
12.include <bsd.prog.mk> 13.include <bsd.prog.mk>
cvs diff -r1.25 -r1.26 src/sbin/mount_portal/Makefile (expand / switch to unified diff)

--- src/sbin/mount_portal/Makefile 2011/08/14 11:34:11 1.25
+++ src/sbin/mount_portal/Makefile 2016/01/23 21:22:47 1.26
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.25 2011/08/14 11:34:11 christos Exp $ 1# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:47 christos Exp $
2# @(#)Makefile 8.3 (Berkeley) 3/27/94 2# @(#)Makefile 8.3 (Berkeley) 3/27/94
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6PROG= mount_portal 6PROG= mount_portal
7SRCS= puffs_portal.c activate.c conf.c pt_conf.c \ 7SRCS= puffs_portal.c activate.c conf.c pt_conf.c \
8 pt_exec.c pt_file.c pt_tcp.c pt_filter.c 8 pt_exec.c pt_file.c pt_tcp.c pt_filter.c
9SUBDIR= examples 9SUBDIR= examples
10 10
11MAN= mount_portal.8 11MAN= mount_portal.8
12 12
13DPADD+=${LIBUTIL} ${LIBPUFFS} 13DPADD+=${LIBUTIL} ${LIBPUFFS}
14LDADD+=-lutil -lpuffs 14LDADD+=-lutil -lpuffs
 15CPPFLAGS+= -D_KERNTYPES
15 16
16COPTS.pt_filter.c = -Wno-format-nonliteral 17COPTS.pt_filter.c = -Wno-format-nonliteral
17 18
18.include <bsd.prog.mk> 19.include <bsd.prog.mk>
19.include <bsd.subdir.mk> 20.include <bsd.subdir.mk>
cvs diff -r1.1 -r1.2 src/sbin/mount_puffs/Makefile (expand / switch to unified diff)

--- src/sbin/mount_puffs/Makefile 2010/01/14 21:25:48 1.1
+++ src/sbin/mount_puffs/Makefile 2016/01/23 21:22:47 1.2
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1# $NetBSD: Makefile,v 1.1 2010/01/14 21:25:48 pooka Exp $ 1# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:47 christos Exp $
2# 2#
3 3
4PROG= mount_puffs 4PROG= mount_puffs
5 5
6DPADD+= ${LIBUTIL} 6DPADD+= ${LIBUTIL}
7LDADD+= -lutil 7LDADD+= -lutil
 8CPPFLAGS+= -D_KERNTYPES
8 9
9MAN= mount_puffs.8 10MAN= mount_puffs.8
10 11
11.include <bsd.prog.mk> 12.include <bsd.prog.mk>
cvs diff -r1.293 -r1.294 src/share/mk/bsd.prog.mk (expand / switch to unified diff)

--- src/share/mk/bsd.prog.mk 2015/11/07 23:41:58 1.293
+++ src/share/mk/bsd.prog.mk 2016/01/23 21:22:47 1.294
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prog.mk,v 1.293 2015/11/07 23:41:58 joerg Exp $ 1# $NetBSD: bsd.prog.mk,v 1.294 2016/01/23 21:22:47 christos Exp $
2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
3 3
4.ifndef HOSTPROG 4.ifndef HOSTPROG
5 5
6.include <bsd.init.mk> 6.include <bsd.init.mk>
7.include <bsd.shlib.mk> 7.include <bsd.shlib.mk>
8.include <bsd.gcc.mk> 8.include <bsd.gcc.mk>
9 9
10# 10#
11# Definitions and targets shared among all programs built by a single 11# Definitions and targets shared among all programs built by a single
12# Makefile. 12# Makefile.
13# 13#
14 14
@@ -320,26 +320,27 @@ __progdebuginstall: .USE @@ -320,26 +320,27 @@ __progdebuginstall: .USE
320# 320#
321 321
322_APPEND_MANS=yes 322_APPEND_MANS=yes
323_APPEND_SRCS=yes 323_APPEND_SRCS=yes
324 324
325_CCLINKFLAGS= 325_CCLINKFLAGS=
326 326
327.if defined(PROG_CXX) 327.if defined(PROG_CXX)
328PROG= ${PROG_CXX} 328PROG= ${PROG_CXX}
329_CCLINK= ${CXX} ${_CCLINKFLAGS} 329_CCLINK= ${CXX} ${_CCLINKFLAGS}
330.endif 330.endif
331 331
332.if defined(RUMPPRG) 332.if defined(RUMPPRG)
 333CPPFLAGS+= -D_KERNTYPES
333PROG= ${RUMPPRG} 334PROG= ${RUMPPRG}
334. ifndef CRUNCHEDPROG 335. ifndef CRUNCHEDPROG
335. if (${MKRUMP} != "no") 336. if (${MKRUMP} != "no")
336PROGS= ${RUMPPRG} rump.${RUMPPRG} 337PROGS= ${RUMPPRG} rump.${RUMPPRG}
337. else 338. else
338PROGS= ${RUMPPRG} 339PROGS= ${RUMPPRG}
339. endif 340. endif
340. if defined(SRCS) 341. if defined(SRCS)
341. if (${MKRUMP} != "no") 342. if (${MKRUMP} != "no")
342SRCS.rump.${PROG}:= ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS} 343SRCS.rump.${PROG}:= ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
343. endif 344. endif
344SRCS+= ${PROG}_hostops.c 345SRCS+= ${PROG}_hostops.c
345. else 346. else
cvs diff -r1.67 -r1.68 src/sys/arch/i386/stand/boot/Makefile.boot (expand / switch to unified diff)

--- src/sys/arch/i386/stand/boot/Makefile.boot 2015/08/20 11:39:28 1.67
+++ src/sys/arch/i386/stand/boot/Makefile.boot 2016/01/23 21:22:47 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.boot,v 1.67 2015/08/20 11:39:28 uebayasi Exp $ 1# $NetBSD: Makefile.boot,v 1.68 2016/01/23 21:22:47 christos Exp $
2 2
3S= ${.CURDIR}/../../../../.. 3S= ${.CURDIR}/../../../../..
4 4
5NOMAN= 5NOMAN=
6PROG?= boot 6PROG?= boot
7NEWVERSWHAT?= "BIOS Boot" 7NEWVERSWHAT?= "BIOS Boot"
8VERSIONFILE?= ${.CURDIR}/../version 8VERSIONFILE?= ${.CURDIR}/../version
9 9
10AFLAGS.biosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 10AFLAGS.biosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
11 11
12SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c 12SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
13SRCS= ${SOURCES} 13SRCS= ${SOURCES}
14.if !make(depend) 14.if !make(depend)
@@ -26,27 +26,27 @@ STRIPFLAG= # nothing @@ -26,27 +26,27 @@ STRIPFLAG= # nothing
26LIBCRT0= # nothing 26LIBCRT0= # nothing
27LIBCRTI= # nothing 27LIBCRTI= # nothing
28LIBCRTBEGIN= # nothing 28LIBCRTBEGIN= # nothing
29LIBCRTEND= # nothing 29LIBCRTEND= # nothing
30LIBC= # nothing 30LIBC= # nothing
31 31
32BINDIR=/usr/mdec 32BINDIR=/usr/mdec
33BINMODE=444 33BINMODE=444
34 34
35.PATH: ${.CURDIR}/.. ${.CURDIR}/../../lib 35.PATH: ${.CURDIR}/.. ${.CURDIR}/../../lib
36 36
37LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start 37LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start
38CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa 38CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
39CPPFLAGS+= -I ${.OBJDIR} 39CPPFLAGS+= -I ${.OBJDIR} -D_KERNTYPES
40# Make sure we override any optimization options specified by the user 40# Make sure we override any optimization options specified by the user
41COPTS= -Os 41COPTS= -Os
42 42
43.if ${MACHINE_ARCH} == "x86_64" 43.if ${MACHINE_ARCH} == "x86_64"
44LDFLAGS+= -Wl,-m,elf_i386 44LDFLAGS+= -Wl,-m,elf_i386
45AFLAGS+= -m32 45AFLAGS+= -m32
46CPUFLAGS= -m32 46CPUFLAGS= -m32
47LIBKERN_ARCH=i386 47LIBKERN_ARCH=i386
48KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386" 48KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
49.else 49.else
50CPUFLAGS= -march=i386 -mtune=i386 50CPUFLAGS= -march=i386 -mtune=i386
51.endif 51.endif
52 52
cvs diff -r1.28 -r1.29 src/sys/arch/i386/stand/dosboot/Makefile (expand / switch to unified diff)

--- src/sys/arch/i386/stand/dosboot/Makefile 2014/01/15 22:25:22 1.28
+++ src/sys/arch/i386/stand/dosboot/Makefile 2016/01/23 21:22:47 1.29
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.28 2014/01/15 22:25:22 joerg Exp $ 1# $NetBSD: Makefile,v 1.29 2016/01/23 21:22:47 christos Exp $
2 2
3S= ${.CURDIR}/../../../.. 3S= ${.CURDIR}/../../../..
4 4
5BASE= dosboot 5BASE= dosboot
6PROG= ${BASE}.com 6PROG= ${BASE}.com
7NOMAN= # defined 7NOMAN= # defined
8NEWVERSWHAT= "DOS Boot" 8NEWVERSWHAT= "DOS Boot"
9STARTFILE= ${DOSSTART} 9STARTFILE= ${DOSSTART}
10RELOC= 0x100 10RELOC= 0x100
11 11
12SRCS= main.c devopen.c exec.c 12SRCS= main.c devopen.c exec.c
13 13
14CPPFLAGS+= -DSLOW # for libz 14CPPFLAGS+= -DSLOW # for libz
15CPPFLAGS+= -DCOMPAT_386BSD_MBRPART 15CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
16CPPFLAGS+= -DXMS 16CPPFLAGS+= -DXMS -D_KERNTYPES
17CPPFLAGS+= -DLIBSA_ENABLE_LS_OP 17CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
18#uncomment if there are problems with memory detection 18#uncomment if there are problems with memory detection
19#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT 19#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
20 20
21#CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop 21#CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
22CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main 22CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
23 23
24# XXX should go into library 24# XXX should go into library
25SRCS+= getopt.c 25SRCS+= getopt.c
26.PATH: ${.CURDIR}/../libsa 26.PATH: ${.CURDIR}/../libsa
27 27
28# XXX these should depend on the size of the image 28# XXX these should depend on the size of the image
29CPPFLAGS+= -DSTACK_START=0x10000 29CPPFLAGS+= -DSTACK_START=0x10000
cvs diff -r1.22 -r1.23 src/sys/arch/i386/stand/pxeboot/Makefile (expand / switch to unified diff)

--- src/sys/arch/i386/stand/pxeboot/Makefile 2014/01/15 22:25:22 1.22
+++ src/sys/arch/i386/stand/pxeboot/Makefile 2016/01/23 21:22:47 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2014/01/15 22:25:22 joerg Exp $ 1# $NetBSD: Makefile,v 1.23 2016/01/23 21:22:47 christos Exp $
2 2
3S= ${.CURDIR}/../../../.. 3S= ${.CURDIR}/../../../..
4 4
5BASE?= pxeboot_ia32 5BASE?= pxeboot_ia32
6PROG= ${BASE}.bin 6PROG= ${BASE}.bin
7NOMAN= # defined 7NOMAN= # defined
8NEWVERSWHAT= "PXE Boot" 8NEWVERSWHAT= "PXE Boot"
9STARTFILE= ${PXESTART} 9STARTFILE= ${PXESTART}
10RELOC= 0x0 10RELOC= 0x0
11 11
12.if (${BASE} != "pxeboot_ia32") 12.if (${BASE} != "pxeboot_ia32")
13.PATH.c: ${.CURDIR}/../pxeboot 13.PATH.c: ${.CURDIR}/../pxeboot
14.PATH.S: ${.CURDIR}/../pxeboot 14.PATH.S: ${.CURDIR}/../pxeboot
@@ -30,27 +30,27 @@ LDFLAGS+= -Wl,-m,elf_i386 @@ -30,27 +30,27 @@ LDFLAGS+= -Wl,-m,elf_i386
30AFLAGS+= -m32 30AFLAGS+= -m32
31LIBKERN_ARCH= i386 31LIBKERN_ARCH= i386
32KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386" 32KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
33.endif 33.endif
34 34
35CPPFLAGS+= -DSLOW # for libz 35CPPFLAGS+= -DSLOW # for libz
36 36
37.if (${BASE} == "pxeboot_ia32") 37.if (${BASE} == "pxeboot_ia32")
38# Take config values from patchable header 38# Take config values from patchable header
39CPPFLAGS+= -DSUPPORT_SERIAL=boot_params.bp_consdev 39CPPFLAGS+= -DSUPPORT_SERIAL=boot_params.bp_consdev
40CPPFLAGS+= -DCONSPEED=boot_params.bp_conspeed 40CPPFLAGS+= -DCONSPEED=boot_params.bp_conspeed
41CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr 41CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr
42CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap 42CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap
43CPPFLAGS+= -DDIRECT_SERIAL 43CPPFLAGS+= -DDIRECT_SERIAL -D_KERNTYPES
44# Various serial line configurations 44# Various serial line configurations
45#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL 45#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
46# or 46# or
47#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0KBD 47#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0KBD
48# or 48# or
49#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_AUTO  49#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_AUTO
50# and maybe  50# and maybe
51#CPPFLAGS+= -DDIRECT_SERIAL -DCOMCONS_KEYPRESS -DCONSPEED=57600 51#CPPFLAGS+= -DDIRECT_SERIAL -DCOMCONS_KEYPRESS -DCONSPEED=57600
52.endif 52.endif
53 53
54.if (${BASE} == "pxeboot_ia32_com0") 54.if (${BASE} == "pxeboot_ia32_com0")
55CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0 -DDIRECT_SERIAL 55CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0 -DDIRECT_SERIAL
56.endif 56.endif
cvs diff -r1.1 -r1.2 src/tests/dev/Makefile.inc (expand / switch to unified diff)

--- src/tests/dev/Makefile.inc 2010/11/03 16:10:19 1.1
+++ src/tests/dev/Makefile.inc 2016/01/23 21:22:48 1.2
cvs diff -r1.4 -r1.5 src/tests/dev/audio/Makefile (expand / switch to unified diff)

--- src/tests/dev/audio/Makefile 2012/12/02 18:39:53 1.4
+++ src/tests/dev/audio/Makefile 2016/01/23 21:22:48 1.5
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.4 2012/12/02 18:39:53 pgoyette Exp $ 1# $NetBSD: Makefile,v 1.5 2016/01/23 21:22:48 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/dev/audio 6TESTSDIR= ${TESTSBASE}/dev/audio
7FILESDIR= ${TESTSDIR} 7FILESDIR= ${TESTSDIR}
8 8
9TESTS_SH= t_pad 9TESTS_SH= t_pad
10 10
11BINDIR= ${TESTSDIR} 11BINDIR= ${TESTSDIR}
12MKMAN=no 12MKMAN=no
13 13
14PROGS= h_pad 14PROGS= h_pad
15 15
 16CPPFLAGS+= -D_KERNTYPES
16LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs 17LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs
17LDADD+= -lrump 18LDADD+= -lrump
18LDADD+= -lrumpuser 19LDADD+= -lrumpuser
19LDADD+= -lrump 20LDADD+= -lrump
20LDADD+= -lpthread 21LDADD+= -lpthread
21 22
22FILES= t_pad_output.bz2.uue 23FILES= t_pad_output.bz2.uue
23 24
24WARNS= 4 25WARNS= 4
25NOMAN= 26NOMAN=
26 27
27.include <bsd.test.mk> 28.include <bsd.test.mk>
cvs diff -r1.2 -r1.3 src/tests/dev/dm/Makefile (expand / switch to unified diff)

--- src/tests/dev/dm/Makefile 2012/12/02 18:39:53 1.2
+++ src/tests/dev/dm/Makefile 2016/01/23 21:22:48 1.3
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1 1
2# $NetBSD: Makefile,v 1.2 2012/12/02 18:39:53 pgoyette Exp $ 2# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:48 christos Exp $
3# 3#
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7TESTSDIR= ${TESTSBASE}/dev/dm 7TESTSDIR= ${TESTSBASE}/dev/dm
8FILESDIR= ${TESTSDIR} 8FILESDIR= ${TESTSDIR}
9 9
10TESTS_SH= t_dm 10TESTS_SH= t_dm
11 11
12BINDIR= ${TESTSDIR} 12BINDIR= ${TESTSDIR}
13MKMAN=no 13MKMAN=no
14 14
15PROGS= h_dm 15PROGS= h_dm
16 16
 17CPPFLAGS+=-D_KERNTYPES
17LDADD+= -lprop -lutil 18LDADD+= -lprop -lutil
18LDADD+= -lrumpdev_disk -lrumpdev_dm 19LDADD+= -lrumpdev_disk -lrumpdev_dm
19LDADD+= -lrumpdev -lrumpvfs 20LDADD+= -lrumpdev -lrumpvfs
20LDADD+= -lrump 21LDADD+= -lrump
21LDADD+= -lrumpuser -lpthread 22LDADD+= -lrumpuser -lpthread
22 23
23FILES= t_dm_disk_1.bz2.uue t_dm_disk_2.bz2.uue t_dm_disk_3.bz2.uue 24FILES= t_dm_disk_1.bz2.uue t_dm_disk_2.bz2.uue t_dm_disk_3.bz2.uue
24 25
25WARNS= 4 26WARNS= 4
26NOMAN= 27NOMAN=
27 28
28.include <bsd.test.mk> 29.include <bsd.test.mk>
cvs diff -r1.5 -r1.6 src/tests/dev/md/Makefile (expand / switch to unified diff)

--- src/tests/dev/md/Makefile 2015/01/07 22:24:03 1.5
+++ src/tests/dev/md/Makefile 2016/01/23 21:22:48 1.6
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.5 2015/01/07 22:24:03 pooka Exp $ 1# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:48 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/dev/md 6TESTSDIR= ${TESTSBASE}/dev/md
7FILESDIR= ${TESTSDIR} 7FILESDIR= ${TESTSDIR}
8 8
9TESTS_SH= t_md 9TESTS_SH= t_md
10 10
11BINDIR= ${TESTSDIR} 11BINDIR= ${TESTSDIR}
12MKMAN=no 12MKMAN=no
13 13
14PROGS= h_mdserv 14PROGS= h_mdserv
15 15
 16CPPFLAGS+= -D_KERNTYPES
16LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs 17LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs
17LDADD+= -lrumpkern_sysproxy -lrump 18LDADD+= -lrumpkern_sysproxy -lrump
18LDADD+= -lrumpuser 19LDADD+= -lrumpuser
19LDADD+= -lpthread 20LDADD+= -lpthread
20 21
21WARNS= 4 22WARNS= 4
22NOMAN= 23NOMAN=
23 24
24.include <bsd.test.mk> 25.include <bsd.test.mk>
cvs diff -r1.6 -r1.7 src/tests/dev/scsipi/Makefile (expand / switch to unified diff)

--- src/tests/dev/scsipi/Makefile 2014/06/10 04:28:39 1.6
+++ src/tests/dev/scsipi/Makefile 2016/01/23 21:22:48 1.7
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.6 2014/06/10 04:28:39 he Exp $ 1# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:48 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/dev/scsipi 6TESTSDIR= ${TESTSBASE}/dev/scsipi
7 7
8TESTS_C= t_cd 8TESTS_C= t_cd
9 9
10CPPFLAGS+= -I${.CURDIR}/libscsitest 10CPPFLAGS+= -I${.CURDIR}/libscsitest -D_KERNTYPES
11 11
12# kernel component required by test 12# kernel component required by test
13SUBDIR= libscsitest 13SUBDIR= libscsitest
14SCSITESTDIR!= cd ${.CURDIR}/libscsitest && ${PRINTOBJDIR} 14SCSITESTDIR!= cd ${.CURDIR}/libscsitest && ${PRINTOBJDIR}
15LDFLAGS+= -L${SCSITESTDIR} 15LDFLAGS+= -L${SCSITESTDIR}
16LDADD+= -Wl,--whole-archive -lrumpdev_scsitest -Wl,--no-whole-archive 16LDADD+= -Wl,--whole-archive -lrumpdev_scsitest -Wl,--no-whole-archive
17 17
18LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs 18LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
19LDADD+= -lrump -lutil 19LDADD+= -lrump -lutil
20LDADD+= -lrumpuser -lpthread 20LDADD+= -lrumpuser -lpthread
21LDADD+= -lrump 21LDADD+= -lrump
22 22
23WARNS= 4 23WARNS= 4
cvs diff -r1.3 -r1.4 src/tests/dev/sysmon/Makefile (expand / switch to unified diff)

--- src/tests/dev/sysmon/Makefile 2014/06/10 04:28:39 1.3
+++ src/tests/dev/sysmon/Makefile 2016/01/23 21:22:48 1.4
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $ 1# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:48 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/dev/sysmon 6TESTSDIR= ${TESTSBASE}/dev/sysmon
7 7
8TESTS_C= t_swwdog 8TESTS_C= t_swwdog
9 9
 10CPPFLAGS+= -D_KERNTYPES
10LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs 11LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
11LDADD+= -lrump 12LDADD+= -lrump
12LDADD+= -lrumpuser 13LDADD+= -lrumpuser
13LDADD+= -lrump 14LDADD+= -lrump
14LDADD+= -lpthread 15LDADD+= -lpthread
15 16
16WARNS= 4 17WARNS= 4
17 18
18TESTS_SH= t_swsensor 19TESTS_SH= t_swsensor
19 20
20.include <bsd.test.mk> 21.include <bsd.test.mk>
cvs diff -r1.1 -r1.2 src/tests/fs/Makefile.inc (expand / switch to unified diff)

--- src/tests/fs/Makefile.inc 2010/11/03 16:10:20 1.1
+++ src/tests/fs/Makefile.inc 2016/01/23 21:22:48 1.2
File Added: src/tests/fs/nfs/Makefile.inc
.include "../Makefile.inc"
cvs diff -r1.4 -r1.5 src/tests/fs/puffs/h_dtfs/Makefile (expand / switch to unified diff)

--- src/tests/fs/puffs/h_dtfs/Makefile 2010/07/13 21:13:23 1.4
+++ src/tests/fs/puffs/h_dtfs/Makefile 2016/01/23 21:22:48 1.5
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:23 jmmv Exp $ 1# $NetBSD: Makefile,v 1.5 2016/01/23 21:22:48 christos Exp $
2 2
3TESTSDIR= ${TESTSBASE}/fs/puffs/h_dtfs 3TESTSDIR= ${TESTSBASE}/fs/puffs/h_dtfs
4ATFFILE= no 4ATFFILE= no
5 5
6TESTS_C= h_dtfs 6TESTS_C= h_dtfs
7 7
 8CPPFLAGS+= -D_KERNTYPES
8SRCS.h_dtfs= dtfs.c dtfs_vfsops.c dtfs_vnops.c dtfs_subr.c 9SRCS.h_dtfs= dtfs.c dtfs_vfsops.c dtfs_vnops.c dtfs_subr.c
9LDADD+= -lpuffs -lutil 10LDADD+= -lpuffs -lutil
10 11
11WARNS=2 12WARNS=2
12 13
13.include <bsd.test.mk> 14.include <bsd.test.mk>
cvs diff -r1.8 -r1.9 src/tests/include/sys/Makefile (expand / switch to unified diff)

--- src/tests/include/sys/Makefile 2015/06/22 00:05:23 1.8
+++ src/tests/include/sys/Makefile 2016/01/23 21:22:48 1.9
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2015/06/22 00:05:23 matt Exp $ 1# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:48 christos Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7TESTSDIR= ${TESTSBASE}/include/sys 7TESTSDIR= ${TESTSBASE}/include/sys
8 8
9TESTS_C= t_bitops t_bootblock t_cdefs t_tree t_types 9TESTS_C= t_bitops t_bootblock t_cdefs t_tree t_types
10 10
11LDADD.t_bitops+= -lm 11LDADD.t_bitops+= -lm
12 12
13.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) 13.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
14TESTS_C+= t_socket 14TESTS_C+= t_socket
 15CPPFLAGS.t_socket.c+= -D_KERNTYPES
15LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet 16LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
16LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread 17LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread
17.endif 18.endif
18 19
19.include <bsd.test.mk> 20.include <bsd.test.mk>
cvs diff -r1.37 -r1.38 src/tests/kernel/Makefile (expand / switch to unified diff)

--- src/tests/kernel/Makefile 2015/06/22 00:05:23 1.37
+++ src/tests/kernel/Makefile 2016/01/23 21:22:48 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2015/06/22 00:05:23 matt Exp $ 1# $NetBSD: Makefile,v 1.38 2016/01/23 21:22:48 christos Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7TESTSDIR= ${TESTSBASE}/kernel 7TESTSDIR= ${TESTSBASE}/kernel
8 8
9TESTS_SUBDIRS= kqueue 9TESTS_SUBDIRS= kqueue
10TESTS_C= t_lock 10TESTS_C= t_lock
11TESTS_C+= t_lockf 11TESTS_C+= t_lockf
12TESTS_C+= t_pty 12TESTS_C+= t_pty
13TESTS_C+= t_mqueue 13TESTS_C+= t_mqueue
14TESTS_C+= t_sysv 14TESTS_C+= t_sysv
@@ -28,26 +28,27 @@ LDADD.t_mqueue+= -lrt @@ -28,26 +28,27 @@ LDADD.t_mqueue+= -lrt
28 28
29 29
30.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) 30.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
31TESTS_SUBDIRS+= tty 31TESTS_SUBDIRS+= tty
32 32
33TESTS_C+= t_extattrctl 33TESTS_C+= t_extattrctl
34TESTS_C+= t_filedesc 34TESTS_C+= t_filedesc
35TESTS_C+= t_rnd 35TESTS_C+= t_rnd
36LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser 36LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser
37LDADD.t_extattrctl+= -lrump -lpthread 37LDADD.t_extattrctl+= -lrump -lpthread
38LDADD.t_filedesc+= ${LDADD.t_rnd} 38LDADD.t_filedesc+= ${LDADD.t_rnd}
39LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser 39LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
40LDADD.t_rnd+= -lrump -lpthread 40LDADD.t_rnd+= -lrump -lpthread
 41CPPFLAGS+= -D_KERNTYPES
41 42
42.endif 43.endif
43 44
44 45
45.PATH: ${NETBSDSRCDIR}/sys/kern 46.PATH: ${NETBSDSRCDIR}/sys/kern
46TESTS_C+= t_extent 47TESTS_C+= t_extent
47SRCS.t_extent= t_extent.c subr_extent.c 48SRCS.t_extent= t_extent.c subr_extent.c
48CPPFLAGS.t_extent.c= -D_EXTENT_TESTING -D__POOL_EXPOSE 49CPPFLAGS.t_extent.c= -D_EXTENT_TESTING -D__POOL_EXPOSE
49CPPFLAGS.subr_extent.c= -D_EXTENT_TESTING -D__POOL_EXPOSE 50CPPFLAGS.subr_extent.c= -D_EXTENT_TESTING -D__POOL_EXPOSE
50 51
51t_subr_prf.c: gen_t_subr_prf ${NETBSDSRCDIR}/sys/kern/subr_prf.c 52t_subr_prf.c: gen_t_subr_prf ${NETBSDSRCDIR}/sys/kern/subr_prf.c
52 ${HOST_SH} ${.ALLSRC} ${.TARGET} 53 ${HOST_SH} ${.ALLSRC} ${.TARGET}
53CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign # XXX platform vs kernel SHA2 54CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign # XXX platform vs kernel SHA2
cvs diff -r1.2 -r1.3 src/tests/kernel/tty/Makefile (expand / switch to unified diff)

--- src/tests/kernel/tty/Makefile 2014/06/10 04:28:39 1.2
+++ src/tests/kernel/tty/Makefile 2016/01/23 21:22:49 1.3
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:39 he Exp $ 1# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:49 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/kernel/tty 5TESTSDIR= ${TESTSBASE}/kernel/tty
6 6
7TESTS_C= t_pr 7TESTS_C= t_pr
8 8
 9CPPFLAGS+= -D_KERNTYPES
9LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser 10LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser
10LDADD+= -lrump 11LDADD+= -lrump
11LDADD+= -lpthread 12LDADD+= -lpthread
12 13
13.include <bsd.test.mk> 14.include <bsd.test.mk>
cvs diff -r1.39 -r1.40 src/tests/lib/libc/sys/Makefile (expand / switch to unified diff)

--- src/tests/lib/libc/sys/Makefile 2015/06/22 00:05:23 1.39
+++ src/tests/lib/libc/sys/Makefile 2016/01/23 21:22:49 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2015/06/22 00:05:23 matt Exp $ 1# $NetBSD: Makefile,v 1.40 2016/01/23 21:22:49 christos Exp $
2 2
3MKMAN= no 3MKMAN= no
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7.include "../arch/Makefile.exec_prot" 7.include "../arch/Makefile.exec_prot"
8 8
9TESTSDIR= ${TESTSBASE}/lib/libc/sys 9TESTSDIR= ${TESTSBASE}/lib/libc/sys
10 10
11TESTS_C+= t_access 11TESTS_C+= t_access
12TESTS_C+= t_bind 12TESTS_C+= t_bind
13TESTS_C+= t_chroot 13TESTS_C+= t_chroot
14TESTS_C+= t_clock_gettime 14TESTS_C+= t_clock_gettime
@@ -62,21 +62,22 @@ TESTS_C+= t_swapcontext @@ -62,21 +62,22 @@ TESTS_C+= t_swapcontext
62TESTS_C+= t_stat 62TESTS_C+= t_stat
63TESTS_C+= t_timer_create 63TESTS_C+= t_timer_create
64TESTS_C+= t_truncate 64TESTS_C+= t_truncate
65TESTS_C+= t_ucontext 65TESTS_C+= t_ucontext
66TESTS_C+= t_umask 66TESTS_C+= t_umask
67TESTS_C+= t_unlink 67TESTS_C+= t_unlink
68TESTS_C+= t_write 68TESTS_C+= t_write
69 69
70SRCS.t_mprotect= t_mprotect.c ${SRCS_EXEC_PROT} 70SRCS.t_mprotect= t_mprotect.c ${SRCS_EXEC_PROT}
71 71
72LDADD.t_getpid+= -lpthread 72LDADD.t_getpid+= -lpthread
73 73
74.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) 74.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 75CPPFLAGS.t_posix_fadvise.c += -D_KERNTYPES
75TESTS_C+= t_posix_fadvise 76TESTS_C+= t_posix_fadvise
76LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread 77LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
77.endif 78.endif
78 79
79WARNS= 4 80WARNS= 4
80 81
81.include <bsd.test.mk> 82.include <bsd.test.mk>
82 83
cvs diff -r1.5 -r1.6 src/tests/lib/librumpclient/Makefile (expand / switch to unified diff)

--- src/tests/lib/librumpclient/Makefile 2012/12/02 17:36:10 1.5
+++ src/tests/lib/librumpclient/Makefile 2016/01/23 21:22:49 1.6
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.5 2012/12/02 17:36:10 pgoyette Exp $ 1# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:49 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/lib/librumpclient 6TESTSDIR= ${TESTSBASE}/lib/librumpclient
7 7
8TESTS_C= t_fd 8TESTS_C= t_fd
9 9
10TESTS_SH= t_exec 10TESTS_SH= t_exec
11 11
12BINDIR= ${TESTSDIR} 12BINDIR= ${TESTSDIR}
13MKMAN= no 13MKMAN= no
14 14
15PROGS+= h_exec 15PROGS+= h_exec
16PROGS+= h_execthr 16PROGS+= h_execthr
 17CPPFLAGS+= -D_KERNTYPES
17 18
18LDADD+= -lrumpclient 19LDADD+= -lrumpclient
19LDADD.h_execthr= -lpthread 20LDADD.h_execthr= -lpthread
20 21
21.include <bsd.test.mk> 22.include <bsd.test.mk>
cvs diff -r1.3 -r1.4 src/tests/lib/semaphore/pthread/Makefile (expand / switch to unified diff)

--- src/tests/lib/semaphore/pthread/Makefile 2014/06/10 04:28:39 1.3
+++ src/tests/lib/semaphore/pthread/Makefile 2016/01/23 21:22:49 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $ 1# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:49 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/lib/semaphore/pthread 5TESTSDIR= ${TESTSBASE}/lib/semaphore/pthread
6 6
7TESTS_C= t_sem_pth 7TESTS_C= t_sem_pth
8 8
9CPPFLAGS+= -I${.CURDIR}/.. 9CPPFLAGS+= -I${.CURDIR}/.. -D_KERNTYPES
10 10
11LDADD+= -lrump -lrumpuser -lrump -lpthread 11LDADD+= -lrump -lrumpuser -lrump -lpthread
12 12
13WARNS= 4 13WARNS= 4
14 14
15.include <bsd.test.mk> 15.include <bsd.test.mk>
cvs diff -r1.11 -r1.12 src/tests/modules/Makefile (expand / switch to unified diff)

--- src/tests/modules/Makefile 2014/06/10 04:28:40 1.11
+++ src/tests/modules/Makefile 2016/01/23 21:22:49 1.12
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.11 2014/06/10 04:28:40 he Exp $ 1# $NetBSD: Makefile,v 1.12 2016/01/23 21:22:49 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/modules 5TESTSDIR= ${TESTSBASE}/modules
 6CPPFLAGS+= -D_KERNTYPES
6 7
7# Ideally this test could be in the parent Makefile, which could not descend 8# Ideally this test could be in the parent Makefile, which could not descend
8# into this directory at all. Unfortunately, the etc/mtree/NetBSD.dist file 9# into this directory at all. Unfortunately, the etc/mtree/NetBSD.dist file
9# creates the 'modules' subdirectory unconditionally, which if left empty 10# creates the 'modules' subdirectory unconditionally, which if left empty
10# will confuse atf-run. Therefore we must install, at the very least, the 11# will confuse atf-run. Therefore we must install, at the very least, the
11# Atffile into it. 12# Atffile into it.
12TESTS_C= t_modctl 13TESTS_C= t_modctl
13TESTS_C+= t_builtin 14TESTS_C+= t_builtin
14LDADD= -lprop 15LDADD= -lprop
15LDADD+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread 16LDADD+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
16 17
17TESTS_SH= t_abi_uvm 18TESTS_SH= t_abi_uvm
18TESTS_SH+= t_modload 19TESTS_SH+= t_modload
cvs diff -r1.1 -r1.2 src/tests/modules/Makefile.inc (expand / switch to unified diff)

--- src/tests/modules/Makefile.inc 2010/11/03 16:10:23 1.1
+++ src/tests/modules/Makefile.inc 2016/01/23 21:22:49 1.2
cvs diff -r1.1 -r1.2 src/tests/net/Makefile.inc (expand / switch to unified diff)

--- src/tests/net/Makefile.inc 2010/11/03 16:10:24 1.1
+++ src/tests/net/Makefile.inc 2016/01/23 21:22:49 1.2
cvs diff -r1.1 -r1.2 src/tests/rump/Makefile.inc (expand / switch to unified diff)

--- src/tests/rump/Makefile.inc 2010/11/03 16:10:25 1.1
+++ src/tests/rump/Makefile.inc 2016/01/23 21:22:49 1.2
cvs diff -r1.31 -r1.32 src/usr.bin/kdump/Makefile (expand / switch to unified diff)

--- src/usr.bin/kdump/Makefile 2015/09/26 03:31:11 1.31
+++ src/usr.bin/kdump/Makefile 2016/01/23 21:22:49 1.32
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.31 2015/09/26 03:31:11 christos Exp $ 1# $NetBSD: Makefile,v 1.32 2016/01/23 21:22:49 christos Exp $
2# @(#)Makefile 8.1 (Berkeley) 6/6/93 2# @(#)Makefile 8.1 (Berkeley) 6/6/93
3 3
4.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR 4.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
5 5
6USE_FORT?= yes # cryptographic software 6USE_FORT?= yes # cryptographic software
7 7
8PROG= kdump 8PROG= kdump
9SRCS= kdump.c subr.c setemul.c siginfo.c 9SRCS= kdump.c subr.c setemul.c siginfo.c
10.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace 10.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace
11CLEANFILES+=siginfo.c 11CLEANFILES+=siginfo.c
12 12
13.if (${MKDYNAMICROOT} == "no") 13.if (${MKDYNAMICROOT} == "no")
14LDSTATIC?=-static 14LDSTATIC?=-static
15.endif 15.endif
16 16
17.include "Makefile.ioctl-c" 17.include "Makefile.ioctl-c"
18.include "Makefile.siginfo-c" 18.include "Makefile.siginfo-c"
19 19
20CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys 20CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys -D_KERNTYPES
21 21
22LDADD+=-lutil 22LDADD+=-lutil
23DPADD+=${LIBUTIL} 23DPADD+=${LIBUTIL}
24 24
25.include <bsd.prog.mk> 25.include <bsd.prog.mk>
cvs diff -r1.29 -r1.30 src/usr.bin/ktruss/Makefile (expand / switch to unified diff)

--- src/usr.bin/ktruss/Makefile 2015/09/26 13:31:27 1.29
+++ src/usr.bin/ktruss/Makefile 2016/01/23 21:22:49 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2015/09/26 13:31:27 christos Exp $ 1# $NetBSD: Makefile,v 1.30 2016/01/23 21:22:49 christos Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR 5.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
6 6
7PROG= ktruss 7PROG= ktruss
8SRCS= ktrace.c dump.c subr.c misc.c setemul.c 8SRCS= ktrace.c dump.c subr.c misc.c setemul.c
9CLEANFILES+= misc.c misc.h 9CLEANFILES+= misc.c misc.h
10 10
11.if (${MKDYNAMICROOT} == "no") 11.if (${MKDYNAMICROOT} == "no")
12LDSTATIC?=-static 12LDSTATIC?=-static
13.endif 13.endif
14 14
@@ -20,18 +20,18 @@ dump.c: misc.h @@ -20,18 +20,18 @@ dump.c: misc.h
20 20
21# Build-time generation. 21# Build-time generation.
22misc.c misc.h: ${DESTDIR}/usr/include/sys/errno.h makeerrnos.sh \ 22misc.c misc.h: ${DESTDIR}/usr/include/sys/errno.h makeerrnos.sh \
23 ${DESTDIR}/usr/include/sys/signal.h 23 ${DESTDIR}/usr/include/sys/signal.h
24 ${_MKTARGET_CREATE} 24 ${_MKTARGET_CREATE}
25 AWK=${TOOL_AWK:Q} CPP=${CPP:Q} CPPFLAGS=${CPPFLAGS:Q} \ 25 AWK=${TOOL_AWK:Q} CPP=${CPP:Q} CPPFLAGS=${CPPFLAGS:Q} \
26 ${HOST_SH} ${.CURDIR}/makeerrnos.sh \ 26 ${HOST_SH} ${.CURDIR}/makeerrnos.sh \
27 ${DESTDIR}/usr/include/sys/errno.h \ 27 ${DESTDIR}/usr/include/sys/errno.h \
28 ${DESTDIR}/usr/include/sys/signal.h misc 28 ${DESTDIR}/usr/include/sys/signal.h misc
29 29
30.include "${NETBSDSRCDIR}/usr.bin/kdump/Makefile.ioctl-c" 30.include "${NETBSDSRCDIR}/usr.bin/kdump/Makefile.ioctl-c"
31 31
32CPPFLAGS+= -I. -I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys \ 32CPPFLAGS+= -I. -I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys \
33 -I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS 33 -I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS -D_KERNTYPES
34 34
35.include <bsd.prog.mk> 35.include <bsd.prog.mk>
36 36
37.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace ${NETBSDSRCDIR}/usr.bin/kdump 37.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace ${NETBSDSRCDIR}/usr.bin/kdump
cvs diff -r1.6 -r1.7 src/usr.bin/ldd/Makefile.inc (expand / switch to unified diff)

--- src/usr.bin/ldd/Makefile.inc 2015/06/13 20:38:52 1.6
+++ src/usr.bin/ldd/Makefile.inc 2016/01/23 21:22:49 1.7
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile.inc,v 1.6 2015/06/13 20:38:52 martin Exp $ 1# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:49 christos Exp $
2 2
3WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source 3WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
4 4
5.if ${MKCOMPAT} != "no" 5.if ${MKCOMPAT} != "no"
6 6
7.if ${MACHINE_ARCH} == "sparc64" 7.if ${MACHINE_ARCH} == "sparc64"
8MLIBDIR= sparc 8MLIBDIR= sparc
9.endif 9.endif
10 10
11.if ${MACHINE_ARCH} == "x86_64" 11.if ${MACHINE_ARCH} == "x86_64"
12MLIBDIR= i386 12MLIBDIR= i386
13.endif 13.endif
14 14
15.if ${MACHINE_ARCH} == "powerpc64" 15.if ${MACHINE_ARCH} == "powerpc64"
16MLIBDIR= powerpc 16MLIBDIR= powerpc
17.endif 17.endif
18 18
19# For now make "elf32" look for native (n32) 19# For now make "elf32" look for native (n32)
20.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el") 20.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
21MLIBDIR= 64 21MLIBDIR= 64
22COMPAT_MLIBDIR= o32 22COMPAT_MLIBDIR= o32
23CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32 23CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
24.endif 24.endif
 25CPPFLAGS+= -D_KERNTYPES
25 26
26.endif # MKCOMPAT 27.endif # MKCOMPAT
27 28
28.if exists(${.CURDIR}/../../Makefile.inc) 29.if exists(${.CURDIR}/../../Makefile.inc)
29.include "${.CURDIR}/../../Makefile.inc" 30.include "${.CURDIR}/../../Makefile.inc"
30.endif 31.endif
cvs diff -r1.6 -r1.7 src/usr.bin/pmap/Makefile (expand / switch to unified diff)

--- src/usr.bin/pmap/Makefile 2015/12/14 03:15:10 1.6
+++ src/usr.bin/pmap/Makefile 2016/01/23 21:22:49 1.7
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2015/12/14 03:15:10 christos Exp $ 1# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:49 christos Exp $
2 2
3USE_FORT?= yes # setgid 3USE_FORT?= yes # setgid
4PROG= pmap 4PROG= pmap
5SRCS= main.c pmap.c 5SRCS= main.c pmap.c
6BINGRP= kmem 6BINGRP= kmem
7BINMODE= 2555 7BINMODE= 2555
8LDADD= -lutil -lkvm 8LDADD= -lutil -lkvm
9DPADD= ${LIBUTIL} ${LIBKVM} 9DPADD= ${LIBUTIL} ${LIBKVM}
10 10
11CWARNFLAGS.clang+= -Wno-format-extra-args 11CWARNFLAGS.clang+= -Wno-format-extra-args
 12CPPFLAGS+= -D_KMEMUSER
12 13
13.include <bsd.prog.mk> 14.include <bsd.prog.mk>
cvs diff -r1.7 -r1.8 src/usr.bin/rump_allserver/Makefile (expand / switch to unified diff)

--- src/usr.bin/rump_allserver/Makefile 2013/11/13 17:47:27 1.7
+++ src/usr.bin/rump_allserver/Makefile 2016/01/23 21:22:49 1.8
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2013/11/13 17:47:27 pooka Exp $ 1# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:49 christos Exp $
2# 2#
3 3
4PROG= rump_allserver 4PROG= rump_allserver
5MLINKS+=rump_allserver.1 rump_server.1 5MLINKS+=rump_allserver.1 rump_server.1
6 6
7RUMPTOP=${.CURDIR}/../../sys/rump 7RUMPTOP=${.CURDIR}/../../sys/rump
 8CPPFLAGS+= -D_KERNTYPES
8 9
9.include "${RUMPTOP}/dev/Makefile.rumpdevcomp" 10.include "${RUMPTOP}/dev/Makefile.rumpdevcomp"
10.include "${RUMPTOP}/fs/Makefile.rumpfscomp" 11.include "${RUMPTOP}/fs/Makefile.rumpfscomp"
11.include "${RUMPTOP}/kern/Makefile.rumpkerncomp" 12.include "${RUMPTOP}/kern/Makefile.rumpkerncomp"
12.include "${RUMPTOP}/net/Makefile.rumpnetcomp" 13.include "${RUMPTOP}/net/Makefile.rumpnetcomp"
13 14
14LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD} 15LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
15LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread 16LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
16 17
17.include <bsd.prog.mk> 18.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/Makefile (expand / switch to unified diff)

--- src/usr.bin/rump_dhcpclient/Makefile 2011/01/20 18:47:19 1.1
+++ src/usr.bin/rump_dhcpclient/Makefile 2016/01/23 21:22:50 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1# $NetBSD: Makefile,v 1.1 2011/01/20 18:47:19 pooka Exp $ 1# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
2# 2#
3 3
4PROG= rump.dhcpclient 4PROG= rump.dhcpclient
5SRCS= main.c bpf.c common.c configure.c dhcp.c if-bsd.c net.c 5SRCS= main.c bpf.c common.c configure.c dhcp.c if-bsd.c net.c
 6CPPFLAGS+= -D_KERNTYPES
6 7
7LDADD+= -lrumpclient 8LDADD+= -lrumpclient
8 9
9.include <bsd.prog.mk> 10.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 src/usr.bin/rump_halt/Makefile (expand / switch to unified diff)

--- src/usr.bin/rump_halt/Makefile 2010/12/12 12:48:31 1.1
+++ src/usr.bin/rump_halt/Makefile 2016/01/23 21:22:50 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1# $NetBSD: Makefile,v 1.1 2010/12/12 12:48:31 pooka Exp $ 1# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
2# 2#
3 3
4PROG= rump.halt 4PROG= rump.halt
5 5
6LDADD+= -lrumpclient 6LDADD+= -lrumpclient
7DPADD+= ${RUMPCLIENT} 7DPADD+= ${RUMPCLIENT}
 8CPPFLAGS+= -D_KERNTYPES
8 9
9.include <bsd.prog.mk> 10.include <bsd.prog.mk>
cvs diff -r1.8 -r1.9 src/usr.bin/rump_server/Makefile (expand / switch to unified diff)

--- src/usr.bin/rump_server/Makefile 2015/01/07 22:24:03 1.8
+++ src/usr.bin/rump_server/Makefile 2016/01/23 21:22:50 1.9
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2015/01/07 22:24:03 pooka Exp $ 1# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:50 christos Exp $
2# 2#
3 3
4.PATH: ${.CURDIR}/../rump_allserver 4.PATH: ${.CURDIR}/../rump_allserver
5 5
6PROG= rump_server 6PROG= rump_server
7SRCS= rump_allserver.c 7SRCS= rump_allserver.c
8NOMAN= installed by ../rump_allserver 8NOMAN= installed by ../rump_allserver
9 9
 10CPPFLAGS+= -D_KERNTYPES
10LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \ 11LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \
11 -lrumpuser -Wl,--no-whole-archive -lpthread 12 -lrumpuser -Wl,--no-whole-archive -lpthread
12 13
13.include <bsd.prog.mk> 14.include <bsd.prog.mk>
cvs diff -r1.37 -r1.38 src/usr.bin/systat/Makefile (expand / switch to unified diff)

--- src/usr.bin/systat/Makefile 2012/01/06 14:08:08 1.37
+++ src/usr.bin/systat/Makefile 2016/01/23 21:22:50 1.38
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.37 2012/01/06 14:08:08 drochner Exp $ 1# $NetBSD: Makefile,v 1.38 2016/01/23 21:22:50 christos Exp $
2# @(#)Makefile 8.1 (Berkeley) 6/6/93 2# @(#)Makefile 8.1 (Berkeley) 6/6/93
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6USE_FORT?= yes # setgid 6USE_FORT?= yes # setgid
7PROG= systat 7PROG= systat
8 8
9.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat ${NETBSDSRCDIR}/usr.bin/who 9.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat ${NETBSDSRCDIR}/usr.bin/who
10 10
11CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -DSUPPORT_UTMP -DSUPPORT_UTMPX \ 11CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -DSUPPORT_UTMP -DSUPPORT_UTMPX \
12 -I${NETBSDSRCDIR}/usr.bin/who 12 -I${NETBSDSRCDIR}/usr.bin/who -D_KMEMUSER
13CWARNFLAGS+= -Wno-format-y2k 13CWARNFLAGS+= -Wno-format-y2k
14SRCS= bufcache.c cmds.c cmdtab.c disks.c df.c drvstats.c fetch.c \ 14SRCS= bufcache.c cmds.c cmdtab.c disks.c df.c drvstats.c fetch.c \
15 globalcmds.c icmp.c iostat.c ip.c keyboard.c main.c mbufs.c \ 15 globalcmds.c icmp.c iostat.c ip.c keyboard.c main.c mbufs.c \
16 netcmds.c netstat.c pigs.c ps.c swap.c tcp.c vmstat.c utmpentry.c \ 16 netcmds.c netstat.c pigs.c ps.c swap.c tcp.c vmstat.c utmpentry.c \
17 syscall.c 17 syscall.c
18DPADD= ${LIBCURSES} ${LIBTERMINFO} ${LIBM} ${LIBKVM} 18DPADD= ${LIBCURSES} ${LIBTERMINFO} ${LIBM} ${LIBKVM}
19LDADD= -lutil -lcurses -lterminfo -lm -lkvm 19LDADD= -lutil -lcurses -lterminfo -lm -lkvm
20BINGRP= kmem 20BINGRP= kmem
21BINMODE=2555 21BINMODE=2555
22LINKS= ${BINDIR}/systat ${BINDIR}/sysstat 22LINKS= ${BINDIR}/systat ${BINDIR}/sysstat
23MLINKS+=systat.1 sysstat.1 23MLINKS+=systat.1 sysstat.1
24 24
25.if (${USE_INET6} != "no") 25.if (${USE_INET6} != "no")
cvs diff -r1.6 -r1.7 src/usr.sbin/Makefile.inc (expand / switch to unified diff)

--- src/usr.sbin/Makefile.inc 2009/04/22 15:23:01 1.6
+++ src/usr.sbin/Makefile.inc 2016/01/23 21:22:50 1.7
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: Makefile.inc,v 1.6 2009/04/22 15:23:01 lukem Exp $ 1# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:50 christos Exp $
2# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 2# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
3 3
4BINDIR?= /usr/sbin 4BINDIR?= /usr/sbin
5WARNS?= 4 5WARNS?= 4
 6CPPFLAGS+= -D_KERNTYPES
cvs diff -r1.5 -r1.6 src/usr.sbin/acpitools/acpidump/Makefile (expand / switch to unified diff)

--- src/usr.sbin/acpitools/acpidump/Makefile 2009/12/27 21:42:22 1.5
+++ src/usr.sbin/acpitools/acpidump/Makefile 2016/01/23 21:22:50 1.6
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: Makefile,v 1.5 2009/12/27 21:42:22 abs Exp $ 1# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
2# $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $ 2# $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $
3 3
4.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") 4.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
5CPPFLAGS+=-I${.CURDIR}/../../../sys 5CPPFLAGS+=-I${.CURDIR}/../../../sys -D_KERNTYPES
6CPPFLAGS+=-I${.CURDIR}/.. 6CPPFLAGS+=-I${.CURDIR}/..
7PROG= acpidump 7PROG= acpidump
8SRCS= acpi.c acpi_user.c acpidump.c 8SRCS= acpi.c acpi_user.c acpidump.c
9.endif 9.endif
10 10
11MAN= acpidump.8 11MAN= acpidump.8
12.include <bsd.prog.mk> 12.include <bsd.prog.mk>
cvs diff -r1.3 -r1.4 src/usr.sbin/acpitools/amldb/Makefile (expand / switch to unified diff)

--- src/usr.sbin/acpitools/amldb/Makefile 2009/02/14 13:56:41 1.3
+++ src/usr.sbin/acpitools/amldb/Makefile 2016/01/23 21:22:50 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $ 1# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:50 christos Exp $
2# Id: Makefile,v 1.5 2000/07/14 18:16:30 iwasaki Exp  2# Id: Makefile,v 1.5 2000/07/14 18:16:30 iwasaki Exp
3# $FreeBSD: src/usr.sbin/acpi/amldb/Makefile,v 1.7 2001/10/22 17:25:32 iwasaki Exp $ 3# $FreeBSD: src/usr.sbin/acpi/amldb/Makefile,v 1.7 2001/10/22 17:25:32 iwasaki Exp $
4 4
5.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") 5.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
6PROG= amldb 6PROG= amldb
7SRCS= amldb.c debug.c region.c 7SRCS= amldb.c debug.c region.c
8SRCS+= aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c \ 8SRCS+= aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c \
9 aml_obj.c aml_evalobj.c aml_common.c 9 aml_obj.c aml_evalobj.c aml_common.c
10 10
11CPPFLAGS+= -I${.CURDIR} 11CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
12.endif 12.endif
13 13
14MAN= amldb.8 14MAN= amldb.8
15 15
16.include <bsd.prog.mk> 16.include <bsd.prog.mk>
17.PATH: ${.CURDIR}/../aml 17.PATH: ${.CURDIR}/../aml
cvs diff -r1.7 -r1.8 src/usr.sbin/cpuctl/Makefile (expand / switch to unified diff)

--- src/usr.sbin/cpuctl/Makefile 2013/08/01 23:19:39 1.7
+++ src/usr.sbin/cpuctl/Makefile 2016/01/23 21:22:50 1.8
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.7 2013/08/01 23:19:39 matt Exp $ 1# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:50 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.PATH: ${.CURDIR}/arch 5.PATH: ${.CURDIR}/arch
6 6
7PROG= cpuctl 7PROG= cpuctl
8MAN= cpuctl.8 8MAN= cpuctl.8
9SRCS= cpuctl.c 9SRCS= cpuctl.c
10 10
11.if exists(${.CURDIR}/arch/${MACHINE_ARCH}.c) 11.if exists(${.CURDIR}/arch/${MACHINE_ARCH}.c)
12SRCS+= ${MACHINE_ARCH}.c 12SRCS+= ${MACHINE_ARCH}.c
13.elif exists(${.CURDIR}/arch/${MACHINE_CPU}.c) 13.elif exists(${.CURDIR}/arch/${MACHINE_CPU}.c)
14SRCS+= ${MACHINE_CPU}.c 14SRCS+= ${MACHINE_CPU}.c
15.else 15.else
16SRCS+= noarch.c 16SRCS+= noarch.c
17.endif 17.endif
18.if exists(${.CURDIR}/arch/${MACHINE_ARCH}-asm.S) 18.if exists(${.CURDIR}/arch/${MACHINE_ARCH}-asm.S)
19SRCS+= ${MACHINE_ARCH}-asm.S 19SRCS+= ${MACHINE_ARCH}-asm.S
20.endif 20.endif
21 21
 22CPPFLAGS+= -D_KERNTYPES
22LDADD+=-lutil 23LDADD+=-lutil
23DPADD+=${LIBUTIL} 24DPADD+=${LIBUTIL}
24 25
25.include <bsd.prog.mk> 26.include <bsd.prog.mk>
cvs diff -r1.5 -r1.6 src/usr.sbin/perfused/Makefile (expand / switch to unified diff)

--- src/usr.sbin/perfused/Makefile 2012/09/06 16:39:08 1.5
+++ src/usr.sbin/perfused/Makefile 2016/01/23 21:22:50 1.6
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2012/09/06 16:39:08 riz Exp $ 1# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
2 2
3PROG= perfused 3PROG= perfused
4 4
5PERFUSE_OPT_DEBUG_FLAGS= -g -DPERFUSE_DEBUG 5PERFUSE_OPT_DEBUG_FLAGS= -g -DPERFUSE_DEBUG
6 6
7#CFLAGS+= ${PERFUSE_OPT_DEBUG_FLAGS} 7#CFLAGS+= ${PERFUSE_OPT_DEBUG_FLAGS}
8SRCS= perfused.c msg.c debug.c 8SRCS= perfused.c msg.c debug.c
9MAN= perfused.8 9MAN= perfused.8
10WARNS= 4 10WARNS= 4
11 11
 12CPPFLAGS+= -D_KERNTYPES
12LDADD+= -lperfuse -lpuffs 13LDADD+= -lperfuse -lpuffs
13DPADD+= ${LIBPUFFS} 14DPADD+= ${LIBPUFFS}
14 15
15CWARNFLAGS.clang+= -Wno-format-security 16CWARNFLAGS.clang+= -Wno-format-security
16 17
17.include <bsd.prog.mk> 18.include <bsd.prog.mk>
cvs diff -r1.14 -r1.15 src/usr.sbin/puffs/Makefile.inc (expand / switch to unified diff)

--- src/usr.sbin/puffs/Makefile.inc 2014/01/16 01:15:34 1.14
+++ src/usr.sbin/puffs/Makefile.inc 2016/01/23 21:22:50 1.15
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile.inc,v 1.14 2014/01/16 01:15:34 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.15 2016/01/23 21:22:50 christos Exp $
2 2
3WARNS?= 4 3WARNS?= 4
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7USE_FORT?= yes # network client 7USE_FORT?= yes # network client
8 8
9.if exists(${.CURDIR}/../../Makefile.inc) 9.if exists(${.CURDIR}/../../Makefile.inc)
10.include "${.CURDIR}/../../Makefile.inc" 10.include "${.CURDIR}/../../Makefile.inc"
11.endif 11.endif
12 12
13.ifdef ISRUMP 13.ifdef ISRUMP
14.ifdef MOUNTNAME 14.ifdef MOUNTNAME
15PROG= rump_${MOUNTNAME} 15PROG= rump_${MOUNTNAME}
16MAN= rump_${MOUNTNAME}.8 16MAN= rump_${MOUNTNAME}.8
17 17
18MOUNTDIR= ${.CURDIR}/../../../sbin 18MOUNTDIR= ${.CURDIR}/../../../sbin
19MOUNT= ${MOUNTDIR}/mount 19MOUNT= ${MOUNTDIR}/mount
20 20
21CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN 21CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN
 22CPPFLAGS+= -D_KERNTYPES
22SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c 23SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c
23 24
24# on select archs use the kernel module directly, otherwise fallback 25# on select archs use the kernel module directly, otherwise fallback
25# to the rump library 26# to the rump library
26.ifndef DONOTLINKLIBS 27.ifndef DONOTLINKLIBS
27.undef RUMPKMOD 28.undef RUMPKMOD
28.ifdef RUMPKMOD 29.ifdef RUMPKMOD
29OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh 30OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
30KMODULEDIR= ${DESTDIR}/stand/${MACHINE}/${OSRELEASE}/modules/${MOUNTNAME} 31KMODULEDIR= ${DESTDIR}/stand/${MACHINE}/${OSRELEASE}/modules/${MOUNTNAME}
31LDADD+= ${KMODULEDIR}/${MOUNTNAME}.kmod 32LDADD+= ${KMODULEDIR}/${MOUNTNAME}.kmod
32.else 33.else
33LDADD+= -lrumpfs_${MOUNTNAME} 34LDADD+= -lrumpfs_${MOUNTNAME}
34.endif 35.endif