Thu Jun 18 02:46:10 2009 UTC ()
only built int10 on x86.  from macallan.


(mrg)
diff -r1.27 -r1.28 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs diff -r1.27 -r1.28 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile (switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile 2009/06/12 01:59:04 1.27
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile 2009/06/18 02:46:10 1.28
@@ -1,131 +1,135 @@ @@ -1,131 +1,135 @@
1# $NetBSD: Makefile,v 1.27 2009/06/12 01:59:04 mrg Exp $ 1# $NetBSD: Makefile,v 1.28 2009/06/18 02:46:10 mrg Exp $
2 2
3SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c int10 loader \ 3SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c loader \
4 xf86modes exa \ 4 xf86modes exa \
5 xorgos ramdac shadowfb vbe vgahw \ 5 xorgos ramdac shadowfb vbe vgahw \
6 x86emu xaa xf86config xf8_16bpp 6 x86emu xaa xf86config xf8_16bpp
7 7
 8.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 9SUBDIR+= int10
 10.endif
 11
8SUBDIR+= .WAIT utils 12SUBDIR+= .WAIT utils
9 13
10.include <bsd.own.mk> 14.include <bsd.own.mk>
11 15
12.include "../../Makefile.Xserver" 16.include "../../Makefile.Xserver"
13 17
14PROG= Xorg 18PROG= Xorg
15BINMODE= 4711 19BINMODE= 4711
16 20
17.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86 21.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86
18SRCS= xorg.c 22SRCS= xorg.c
19 23
20CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ 24CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
21 -I${X11SRCDIR.xc}/include/fonts \ 25 -I${X11SRCDIR.xc}/include/fonts \
22 -I${X11SRCDIR.xorg-server}/fb \ 26 -I${X11SRCDIR.xorg-server}/fb \
23 -I${X11SRCDIR.xorg-server}/mi \ 27 -I${X11SRCDIR.xorg-server}/mi \
24 -I${X11SRCDIR.xorg-server}/include \ 28 -I${X11SRCDIR.xorg-server}/include \
25 -I${X11SRCDIR.xorg-server}/os \ 29 -I${X11SRCDIR.xorg-server}/os \
26 -I${X11SRCDIR.xorg-server}/Xext \ 30 -I${X11SRCDIR.xorg-server}/Xext \
27 -I${DESTDIR}${X11INCDIR}/X11/extensions \ 31 -I${DESTDIR}${X11INCDIR}/X11/extensions \
28 -I${DESTDIR}${X11INCDIR}/pixman-1 \ 32 -I${DESTDIR}${X11INCDIR}/pixman-1 \
29 -I${DESTDIR}${X11INCDIR}/xorg \ 33 -I${DESTDIR}${X11INCDIR}/xorg \
30 -I${X11SRCDIR.xorg-server}/render \ 34 -I${X11SRCDIR.xorg-server}/render \
31 -DHAVE_DIX_CONFIG_H 35 -DHAVE_DIX_CONFIG_H
32 36
33CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \ 37CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
34 ${X11FLAGS.EXTENSION} 38 ${X11FLAGS.EXTENSION}
35 39
36LDFLAGS+= -rdynamic 40LDFLAGS+= -rdynamic
37 41
38LDADD+= -Wl,--whole-archive 42LDADD+= -Wl,--whole-archive
39LDADD+= ${LDADD.dix} 43LDADD+= ${LDADD.dix}
40LDADD+= ${LDADD.hw/xfree86/init} 44LDADD+= ${LDADD.hw/xfree86/init}
41LDADD+= ${LDADD.config} 45LDADD+= ${LDADD.config}
42LDADD+= ${LDADD.hw/xfree86/loader} 46LDADD+= ${LDADD.hw/xfree86/loader}
43LDADD+= ${LDADD.hw/xfree86/common} 47LDADD+= ${LDADD.hw/xfree86/common}
44LDADD+= ${LDADD.hw/xfree86/xorgos} 48LDADD+= ${LDADD.hw/xfree86/xorgos}
45#LDADD+= ${LDADD.osandcommon} 49#LDADD+= ${LDADD.osandcommon}
46LDADD+= ${LDADD.hw/xfree86/xf86config} 50LDADD+= ${LDADD.hw/xfree86/xf86config}
47LDADD+= ${LDADD.hw/xfree86/dixmods} 51LDADD+= ${LDADD.hw/xfree86/dixmods}
48LDADD+= ${LDADD.hw/xfree86/xf86modes} 52LDADD+= ${LDADD.hw/xfree86/xf86modes}
49LDADD+= ${LDADD.hw/xfree86/ramdac} 53LDADD+= ${LDADD.hw/xfree86/ramdac}
50LDADD+= ${LDADD.hw/xfree86/ddc} 54LDADD+= ${LDADD.hw/xfree86/ddc}
51LDADD+= ${LDADD.hw/xfree86/i2c} 55LDADD+= ${LDADD.hw/xfree86/i2c}
52LDADD+= ${LDADD.composite} 56LDADD+= ${LDADD.composite}
53LDADD+= ${LDADD.mi} 57LDADD+= ${LDADD.mi}
54LDADD+= ${LDADD.xfixes} 58LDADD+= ${LDADD.xfixes}
55LDADD+= ${LDADD.Xext/Xextbuiltin} 59LDADD+= ${LDADD.Xext/Xextbuiltin}
56LDADD+= ${LDADD.render} 60LDADD+= ${LDADD.render}
57LDADD+= ${LDADD.randr} 61LDADD+= ${LDADD.randr}
58LDADD+= ${LDADD.damageext} 62LDADD+= ${LDADD.damageext}
59LDADD+= ${LDADD.miext/damage} 63LDADD+= ${LDADD.miext/damage}
60LDADD+= ${LDADD.miext/shadow} 64LDADD+= ${LDADD.miext/shadow}
61LDADD+= ${LDADD.miext/cw} 65LDADD+= ${LDADD.miext/cw}
62LDADD+= ${LDADD.Xi} 66LDADD+= ${LDADD.Xi}
63LDADD+= ${LDADD.xkb} 67LDADD+= ${LDADD.xkb}
64LDADD+= ${LDADD.os} 68LDADD+= ${LDADD.os}
65LDADD+= ${LDADD.glx} 69LDADD+= ${LDADD.glx}
66LDADD+= ${LDADD.hw/xfree86/dri} 70LDADD+= ${LDADD.hw/xfree86/dri}
67LDADD+= ${LDADD.hw/xfree86/dixmods/fb} 71LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
68LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb} 72LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
69LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp 73LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
70LDADD+= -lpciaccess -ldrm 74LDADD+= -lpciaccess -ldrm
71LDADD+= -lcrypto 75LDADD+= -lcrypto
72LDADD+= -Wl,--no-whole-archive 76LDADD+= -Wl,--no-whole-archive
73 77
74.if ${MACHINE_ARCH} == "i386" 78.if ${MACHINE_ARCH} == "i386"
75LDADD+= -li386 79LDADD+= -li386
76DPADD+= ${LIBI386} 80DPADD+= ${LIBI386}
77.elif ${MACHINE_ARCH} == "x86_64" 81.elif ${MACHINE_ARCH} == "x86_64"
78LDADD+= -lx86_64 82LDADD+= -lx86_64
79DPADD+= ${LIBX86_64} 83DPADD+= ${LIBX86_64}
80.elif ${MACHINE_ARCH} == "alpha" 84.elif ${MACHINE_ARCH} == "alpha"
81LDADD+= -lalpha 85LDADD+= -lalpha
82DPADD+= ${LIBALPHA} 86DPADD+= ${LIBALPHA}
83.endif 87.endif
84 88
85LDADD+= -lm 89LDADD+= -lm
86 90
87DPADD+= ${DPADD.dix} \ 91DPADD+= ${DPADD.dix} \
88 ${DPADD.fb} \ 92 ${DPADD.fb} \
89 ${DPADD.mi} \ 93 ${DPADD.mi} \
90 ${DPADD.xfixes} \ 94 ${DPADD.xfixes} \
91 ${DPADD.Xext} \ 95 ${DPADD.Xext} \
92 ${DPADD.config} \ 96 ${DPADD.config} \
93 ${DPADD.dbe} \ 97 ${DPADD.dbe} \
94 ${DPADD.record} \ 98 ${DPADD.record} \
95 ${DPADD.render} \ 99 ${DPADD.render} \
96 ${DPADD.randr} \ 100 ${DPADD.randr} \
97 ${DPADD.damageext} \ 101 ${DPADD.damageext} \
98 ${DPADD.miext/damage} \ 102 ${DPADD.miext/damage} \
99 ${DPADD.miext/shadow} \ 103 ${DPADD.miext/shadow} \
100 ${DPADD.miext/cw} \ 104 ${DPADD.miext/cw} \
101 ${DPADD.Xi} \ 105 ${DPADD.Xi} \
102 ${DPADD.xkb} \ 106 ${DPADD.xkb} \
103 ${DPADD.composite} \ 107 ${DPADD.composite} \
104 ${DPADD.os} \ 108 ${DPADD.os} \
105 ${DPADD.glx} \ 109 ${DPADD.glx} \
106 ${DPADD.hw/xfree86/dri} \ 110 ${DPADD.hw/xfree86/dri} \
107 ${DPADD.hw/xfree86/dixmods/fb} \ 111 ${DPADD.hw/xfree86/dixmods/fb} \
108 ${DPADD.hw/xfree86/fb} \ 112 ${DPADD.hw/xfree86/fb} \
109 ${DPADD.hw/xfree86/init} \ 113 ${DPADD.hw/xfree86/init} \
110 ${DPADD.hw/xfree86/loader} \ 114 ${DPADD.hw/xfree86/loader} \
111 ${DPADD.hw/xfree86/xf86config} \ 115 ${DPADD.hw/xfree86/xf86config} \
112 ${DPADD.hw/xfree86/dixmods} \ 116 ${DPADD.hw/xfree86/dixmods} \
113 ${DPADD.hw/xfree86/xf86modes} \ 117 ${DPADD.hw/xfree86/xf86modes} \
114 ${DPADD.hw/xfree86/ramdac} \ 118 ${DPADD.hw/xfree86/ramdac} \
115 ${DPADD.hw/xfree86/ddc} \ 119 ${DPADD.hw/xfree86/ddc} \
116 ${DPADD.hw/xfree86/i2c} \ 120 ${DPADD.hw/xfree86/i2c} \
117 ${LIBCWRAPPER} \ 121 ${LIBCWRAPPER} \
118 ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \ 122 ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
119 ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \ 123 ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
120 ${LIBCRYPTO} 124 ${LIBCRYPTO}
121 125
122SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X 126SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
123 127
124# XXX 128# XXX
125#Xorg.1: Xorg.man.pre 129#Xorg.1: Xorg.man.pre
126# cp ${.ALLSRC} ${.TARGET} 130# cp ${.ALLSRC} ${.TARGET}
127MKMAN= no 131MKMAN= no
128 132
129.include <bsd.x11.mk> 133.include <bsd.x11.mk>
130.include <bsd.prog.mk> 134.include <bsd.prog.mk>
131.include <bsd.subdir.mk> 135.include <bsd.subdir.mk>