Tue Jan 22 01:48:34 2013 UTC ()
No need to wrap each version with a separate conditional.


(christos)
diff -r1.6 -r1.7 src/sys/modules/compat/Makefile
cvs diff -r1.6 -r1.7 src/sys/modules/compat/Attic/Makefile (switch to unified diff)

--- src/sys/modules/compat/Attic/Makefile 2011/01/17 15:57:04 1.6
+++ src/sys/modules/compat/Attic/Makefile 2013/01/22 01:48:34 1.7
@@ -1,70 +1,56 @@ @@ -1,70 +1,56 @@
1# $NetBSD: Makefile,v 1.6 2011/01/17 15:57:04 pooka Exp $ 1# $NetBSD: Makefile,v 1.7 2013/01/22 01:48:34 christos Exp $
2 2
3.include "../Makefile.inc" 3.include "../Makefile.inc"
4 4
5.PATH: ${S}/compat/common 5.PATH: ${S}/compat/common
6 6
7KMOD= compat 7KMOD= compat
8 8
9# 9#
10# We don't want to hook these in for the native emulation, but do want 10# We don't want to hook these in for the native emulation, but do want
11# the symbols available for other emulations. So include the source 11# the symbols available for other emulations. So include the source
12# files but don't hook them in via compat_modcmd(). 12# files but don't hook them in via compat_modcmd().
13# 13#
14.if (${MACHINE_ARCH} != "x86_64") 14.if (${MACHINE_ARCH} != "x86_64")
15CPPFLAGS+= -DCOMPAT_09 15CPPFLAGS+= -DCOMPAT_09
16.endif 
17.if (${MACHINE_ARCH} != "x86_64") 
18CPPFLAGS+= -DCOMPAT_10 16CPPFLAGS+= -DCOMPAT_10
19.endif 
20.if (${MACHINE_ARCH} != "x86_64") 
21CPPFLAGS+= -DCOMPAT_11 17CPPFLAGS+= -DCOMPAT_11
22.endif 
23.if (${MACHINE_ARCH} != "x86_64") 
24CPPFLAGS+= -DCOMPAT_12 18CPPFLAGS+= -DCOMPAT_12
25.endif 
26.if (${MACHINE_ARCH} != "x86_64") 
27CPPFLAGS+= -DCOMPAT_13 19CPPFLAGS+= -DCOMPAT_13
28.endif 
29.if (${MACHINE_ARCH} != "x86_64") 
30CPPFLAGS+= -DCOMPAT_14 20CPPFLAGS+= -DCOMPAT_14
31.endif 
32.if (${MACHINE_ARCH} != "x86_64") 
33CPPFLAGS+= -DCOMPAT_15 21CPPFLAGS+= -DCOMPAT_15
34.endif 
35.if (${MACHINE_ARCH} != "x86_64") 
36CPPFLAGS+= -DCOMPAT_16 22CPPFLAGS+= -DCOMPAT_16
37.endif 23.endif
38 24
39CPPFLAGS+= -DCOMPAT_20 25CPPFLAGS+= -DCOMPAT_20
40CPPFLAGS+= -DCOMPAT_30 -DCOMPAT_40 -DCOMPAT_50 26CPPFLAGS+= -DCOMPAT_30 -DCOMPAT_40 -DCOMPAT_50
41CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80 27CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
42CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG -DCOMPAT_43 28CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG -DCOMPAT_43
43 29
44SRCS= kern_exit_43.c kern_info_09.c 30SRCS= kern_exit_43.c kern_info_09.c
45SRCS+= kern_info_43.c kern_ipc_10.c kern_resource_43.c kern_select_50.c 31SRCS+= kern_info_43.c kern_ipc_10.c kern_resource_43.c kern_select_50.c
46SRCS+= kern_sig_13.c kern_sig_43.c kern_xxx_12.c sysv_msg_14.c 32SRCS+= kern_sig_13.c kern_sig_43.c kern_xxx_12.c sysv_msg_14.c
47SRCS+= sysv_sem_14.c sysv_shm_14.c tty_43.c uipc_syscalls_30.c 33SRCS+= sysv_sem_14.c sysv_shm_14.c tty_43.c uipc_syscalls_30.c
48SRCS+= uipc_syscalls_43.c vfs_syscalls_12.c kern_sig_16.c 34SRCS+= uipc_syscalls_43.c vfs_syscalls_12.c kern_sig_16.c
49SRCS+= vfs_syscalls_20.c vfs_syscalls_30.c vfs_syscalls_40.c 35SRCS+= vfs_syscalls_20.c vfs_syscalls_30.c vfs_syscalls_40.c
50SRCS+= vfs_syscalls_43.c vm_12.c vm_43.c compat_mod.c 36SRCS+= vfs_syscalls_43.c vm_12.c vm_43.c compat_mod.c
51SRCS+= sysv_msg_50.c sysv_sem_50.c kern_time_50.c 37SRCS+= sysv_msg_50.c sysv_sem_50.c kern_time_50.c
52SRCS+= sysv_shm_50.c vfs_syscalls_50.c sysv_ipc_50.c 38SRCS+= sysv_shm_50.c vfs_syscalls_50.c sysv_ipc_50.c
53 39
54.PATH: ${S}/arch/${MACHINE}/${MACHINE} 40.PATH: ${S}/arch/${MACHINE}/${MACHINE}
55.PATH: ${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} 41.PATH: ${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
56.PATH: ${S}/arch/${MACHINE_CPU}/${MACHINE_CPU} 42.PATH: ${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}
57 43
58.if (exists(${S}/arch/${MACHINE}/${MACHINE}/compat_13_machdep.c)) || \ 44.if (exists(${S}/arch/${MACHINE}/${MACHINE}/compat_13_machdep.c)) || \
59 (exists(${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}/compat_13_machdep.c)) || \ 45 (exists(${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}/compat_13_machdep.c)) || \
60 (exists(${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}/compat_13_machdep.c)) 46 (exists(${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}/compat_13_machdep.c))
61SRCS+= compat_13_machdep.c 47SRCS+= compat_13_machdep.c
62.endif 48.endif
63 49
64.if (exists(${S}/arch/${MACHINE}/${MACHINE}/compat_16_machdep.c)) || \ 50.if (exists(${S}/arch/${MACHINE}/${MACHINE}/compat_16_machdep.c)) || \
65 (exists(${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}/compat_16_machdep.c)) || \ 51 (exists(${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}/compat_16_machdep.c)) || \
66 (exists(${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}/compat_16_machdep.c)) 52 (exists(${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}/compat_16_machdep.c))
67SRCS+= compat_16_machdep.c 53SRCS+= compat_16_machdep.c
68.endif 54.endif
69 55
70.include <bsd.kmodule.mk> 56.include <bsd.kmodule.mk>