Fri Oct 3 05:14:01 2008 UTC ()
actually pass -DPCI_VIA_TTYE0 on sparc(64), also don't overwrite other
options


(macallan)
diff -r1.19 -r1.20 src/x11/Xserver/hw/xfree86/xf86_os/Makefile
cvs diff -r1.19 -r1.20 src/x11/Xserver/hw/xfree86/xf86_os/Attic/Makefile (switch to unified diff)

--- src/x11/Xserver/hw/xfree86/xf86_os/Attic/Makefile 2008/04/23 05:13:43 1.19
+++ src/x11/Xserver/hw/xfree86/xf86_os/Attic/Makefile 2008/10/03 05:14:01 1.20
@@ -1,139 +1,139 @@ @@ -1,139 +1,139 @@
1# $NetBSD: Makefile,v 1.19 2008/04/23 05:13:43 macallan Exp $ 1# $NetBSD: Makefile,v 1.20 2008/10/03 05:14:01 macallan Exp $
2 2
3.include "../../../Makefile.serverlib" 3.include "../../../Makefile.serverlib"
4 4
5LIB= xf86_os 5LIB= xf86_os
6 6
7.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support 7.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support
8.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd 8.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd
9.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared 9.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared
10SRCS.bsd= bsd_init.c bsd_io.c bsd_VTsw.c libc_wrapper.c std_kbdEv.c \ 10SRCS.bsd= bsd_init.c bsd_io.c bsd_VTsw.c libc_wrapper.c std_kbdEv.c \
11 posix_tty.c bsd_mouse.c stdPci.c vidmem.c sigio.c \ 11 posix_tty.c bsd_mouse.c stdPci.c vidmem.c sigio.c \
12 kmod_noop.c bsd_kbd.c bsd_KbdMap.c at_scancode.c 12 kmod_noop.c bsd_kbd.c bsd_KbdMap.c at_scancode.c
13 13
14.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/linux 14.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/linux
15.if ${MACHINE} == "amd64" 15.if ${MACHINE} == "amd64"
16SRCS.bsd+= pm_noop.c 16SRCS.bsd+= pm_noop.c
17.endif 17.endif
18.if ${MACHINE} == "i386" 18.if ${MACHINE} == "i386"
19SRCS.bsd+= bsd_apm.c 19SRCS.bsd+= bsd_apm.c
20.endif 20.endif
21.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "x86_64" 21.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "x86_64"
22SRCS.bsd+= i386_video.c stdResource.c lnx_agp.c 22SRCS.bsd+= i386_video.c stdResource.c lnx_agp.c
23.for _FN in ${SRCS.bsd} 23.for _FN in ${SRCS.bsd}
24.if ${MACHINE} == "i386" 24.if ${MACHINE} == "i386"
25CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV 25CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV
26.endif 26.endif
27CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCONS_SUPPORT \ 27CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCONS_SUPPORT \
28 -DUSESTDRES -DHAVE_SYSV_IPC \ 28 -DUSESTDRES -DHAVE_SYSV_IPC \
29 -DHAS_MTRR_BUILTIN -DUSE_I386_IOPL  29 -DHAS_MTRR_BUILTIN -DUSE_I386_IOPL
30.endfor 30.endfor
31.endif 31.endif
32 32
33.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" 33.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
34SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c lnx_agp.c 34SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c lnx_agp.c
35.for _FN in ${SRCS.bsd} 35.for _FN in ${SRCS.bsd}
36CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC \ 36CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC \
37 -DUSE_PPC_MMAP 37 -DUSE_PPC_MMAP
38.endfor 38.endfor
39.endif 39.endif
40 40
41.if ${MACHINE} == "sgimips" 41.if ${MACHINE} == "sgimips"
42SRCS.bsd+= mips_video.c bsdResource.c pm_noop.c lnx_agp.c 42SRCS.bsd+= mips_video.c bsdResource.c pm_noop.c lnx_agp.c
43.for _FN in ${SRCS.bsd} 43.for _FN in ${SRCS.bsd}
44CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC 44CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
45.endfor 45.endfor
46.endif 46.endif
47 47
48.if ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" 48.if ${MACHINE} == "sparc64" || ${MACHINE} == "sparc"
49SRCS.bsd+= sparc64_video.c bsdResource.c pm_noop.c lnx_agp.c \ 49SRCS.bsd+= sparc64_video.c bsdResource.c pm_noop.c lnx_agp.c \
50 ioperm_noop.c netbsdSbus.c 50 ioperm_noop.c netbsdSbus.c
51.for _FN in ${SRCS.bsd} 51.for _FN in ${SRCS.bsd}
52CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC \ 52CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
53 -DPCI_VIA_TTYE0 
54.endfor 53.endfor
55.endif 54.endif
56 55
57.if ${MACHINE} == "cats" 56.if ${MACHINE} == "cats"
58SRCS.bsd+= arm_video.c bsdResource.c pm_noop.c agp_noop.c ioperm_noop.c 57SRCS.bsd+= arm_video.c bsdResource.c pm_noop.c agp_noop.c ioperm_noop.c
59.for _FN in ${SRCS.bsd} 58.for _FN in ${SRCS.bsd}
60CPPFLAGS.${_FN}= -DPCVT_SUPPORT -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC 59CPPFLAGS.${_FN}= -DPCVT_SUPPORT -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
61.endfor 60.endfor
62.endif 61.endif
63 62
64.if ${MACHINE} == "netwinder" 63.if ${MACHINE} == "netwinder"
65SRCS.bsd+= arm_video.c bsdResource.c pm_noop.c agp_noop.c ioperm_noop.c 64SRCS.bsd+= arm_video.c bsdResource.c pm_noop.c agp_noop.c ioperm_noop.c
66.for _FN in ${SRCS.bsd} 65.for _FN in ${SRCS.bsd}
67CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC 66CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
68.endfor 67.endfor
69.endif 68.endif
70 69
71.if ${MACHINE} == "shark" 70.if ${MACHINE} == "shark"
72SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c 71SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
73.for _FN in ${SRCS.bsd} 72.for _FN in ${SRCS.bsd}
74CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_PPC_MMAP 73CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_PPC_MMAP
75.endfor 74.endfor
76.endif 75.endif
77 76
78.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus 77.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus
79SRCS.bus= Pci.c 78SRCS.bus= Pci.c
80 79
81.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" 80.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
82SRCS.bus+= ix86Pci.c 81SRCS.bus+= ix86Pci.c
83.endif 82.endif
84 83
85.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \ 84.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
86 ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \ 85 ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \
87 ${MACHINE} == "sparc" || ${MACHINE} == "netwinder" || \ 86 ${MACHINE} == "sparc" || ${MACHINE} == "netwinder" || \
88 ${MACHINE} == "shark" || ${MACHINE} == "ofppc" 87 ${MACHINE} == "shark" || ${MACHINE} == "ofppc"
89SRCS.bus+= netbsdPci.c 88SRCS.bus+= netbsdPci.c
90.endif 89.endif
91 90
92.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" 91.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
 92 ${MACHINE} == "sparc64" || ${MACHINE} == "sparc"
93.for _FN in ${SRCS.bus} 93.for _FN in ${SRCS.bus}
94CPPFLAGS.${_FN}= -DPCI_VIA_TTYE0 94CPPFLAGS.${_FN}+= -DPCI_VIA_TTYE0
95.endfor 95.endfor
96.endif 96.endif
97 97
98.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/misc 98.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/misc
99SRCS.misc= xf86_Util.c Delay.c xf86_IlHack.c 99SRCS.misc= xf86_Util.c Delay.c xf86_IlHack.c
100 100
101.if ${MACHINE} == "i386" 101.if ${MACHINE} == "i386"
102SRCS.misc+= BUSmemcpy.S IODelay.S SlowBcopy.S 102SRCS.misc+= BUSmemcpy.S IODelay.S SlowBcopy.S
103CPPFLAGS.BUSmemcpy.S= -DUSE_GAS 103CPPFLAGS.BUSmemcpy.S= -DUSE_GAS
104CPPFLAGS.IODelay.S= -DUSE_GAS 104CPPFLAGS.IODelay.S= -DUSE_GAS
105CPPFLAGS.SlowBcopy.S= -DUSE_GAS 105CPPFLAGS.SlowBcopy.S= -DUSE_GAS
106.endif 106.endif
107 107
108.if ${MACHINE} == "amd64" || ${MACHINE} == "macppc" || \ 108.if ${MACHINE} == "amd64" || ${MACHINE} == "macppc" || \
109 ${MACHINE} == "cats" || ${MACHINE} == "sgimips" || \ 109 ${MACHINE} == "cats" || ${MACHINE} == "sgimips" || \
110 ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \ 110 ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \
111 ${MACHINE} == "netwinder" || ${MACHINE} == "shark" || \ 111 ${MACHINE} == "netwinder" || ${MACHINE} == "shark" || \
112 ${MACHINE} == "ofppc" 112 ${MACHINE} == "ofppc"
113SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c 113SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
114.endif 114.endif
115 115
116# XXX namespace collision so avoid it, only has to be done for non-i386. 116# XXX namespace collision so avoid it, only has to be done for non-i386.
117BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \ 117BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \
118 IODelay.c CIODelay.c \ 118 IODelay.c CIODelay.c \
119 SlowBcopy.c CSlowBcopy.c 119 SlowBcopy.c CSlowBcopy.c
120 120
121SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc} 121SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc}
122 122
123CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ 123CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
124 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ 124 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
125 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd \ 125 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd \
126 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus \ 126 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus \
127 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/misc \ 127 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/misc \
128 -I${X11SRCDIR.xc}/programs/Xserver/include \ 128 -I${X11SRCDIR.xc}/programs/Xserver/include \
129 -I${DESTDIR}${X11INCDIR}/X11 \ 129 -I${DESTDIR}${X11INCDIR}/X11 \
130 -I${DESTDIR}${X11INCDIR}/X11/extensions \ 130 -I${DESTDIR}${X11INCDIR}/X11/extensions \
131 -I${X11SRCDIR.xc}/programs/Xserver/mi \ 131 -I${X11SRCDIR.xc}/programs/Xserver/mi \
132 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared \ 132 -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared \
133 -I${XSERVERINCDIR} 133 -I${XSERVERINCDIR}
134.if ${X11DRI} != "no" 134.if ${X11DRI} != "no"
135CPPFLAGS+= ${X11FLAGS.DRI} 135CPPFLAGS+= ${X11FLAGS.DRI}
136.endif 136.endif
137 137
138.include <bsd.x11.mk> 138.include <bsd.x11.mk>
139.include <bsd.lib.mk> 139.include <bsd.lib.mk>