Fri Jan 10 15:50:34 2014 UTC ()
don't include bsd.sys.mk


(christos)
diff -r1.19 -r1.20 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs diff -r1.19 -r1.20 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile (switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile 2014/01/10 15:00:16 1.19
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile 2014/01/10 15:50:34 1.20
@@ -1,138 +1,137 @@ @@ -1,138 +1,137 @@
1# $NetBSD: Makefile,v 1.19 2014/01/10 15:00:16 martin Exp $ 1# $NetBSD: Makefile,v 1.20 2014/01/10 15:50:34 christos Exp $
2 2
3.include <bsd.own.mk> # prerequisite for bsd.sys.mk 3.include <bsd.own.mk> # prerequisite for bsd.sys.mk
4.include <bsd.sys.mk> # for HOST_SH 
5 4
6.include "../../../Makefile.serverlib" 5.include "../../../Makefile.serverlib"
7.include "../../../Makefile.servermod" 6.include "../../../Makefile.servermod"
8 7
9LIB= common 8LIB= common
10 9
11.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common 10.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common
12SRCS.xv= xf86xv.c xf86xvmc.c 11SRCS.xv= xf86xv.c xf86xvmc.c
13SRCS.bus= xf86pciBus.c xf86fbBus.c xf86noBus.c 12SRCS.bus= xf86pciBus.c xf86fbBus.c xf86noBus.c
14SRCS.randr= xf86RandR.c 13SRCS.randr= xf86RandR.c
15 14
16SRCS= xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \ 15SRCS= xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
17 xf86Cursor.c xf86DGA.c xf86DPMS.c \ 16 xf86Cursor.c xf86DGA.c xf86DPMS.c \
18 xf86Events.c xf86Globals.c xf86AutoConfig.c \ 17 xf86Events.c xf86Globals.c xf86AutoConfig.c \
19 xf86Option.c \ 18 xf86Option.c \
20 xf86VidMode.c xf86fbman.c xf86cmap.c \ 19 xf86VidMode.c xf86fbman.c xf86cmap.c \
21 xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \ 20 xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
22 xf86Mode.c xorgHelper.c \ 21 xf86Mode.c xorgHelper.c \
23 ${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \ 22 ${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \
24 xf86DefModeSet.c \ 23 xf86DefModeSet.c \
25 xf86VGAarbiter.c 24 xf86VGAarbiter.c
26 25
27.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" 26.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
28SRCS.bus+= xf86sbusBus.c 27SRCS.bus+= xf86sbusBus.c
29.endif 28.endif
30 29
31# Rebuild xf86Build.h on every make 30# Rebuild xf86Build.h on every make
32# 31#
33CLEANFILES+= xf86Build.h 32CLEANFILES+= xf86Build.h
34xf86Build.h: .PHONY 33xf86Build.h: .PHONY
35 ${_MKTARGET_CREATE} 34 ${_MKTARGET_CREATE}
36 echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET} 35 echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET}
37 36
38# We don't use DPSRCS+=xf86Build.h because we don't want the entire 37# We don't use DPSRCS+=xf86Build.h because we don't want the entire
39# library to be rebuilt each time 38# library to be rebuilt each time
40# 39#
41xf86Init.c xf86Init.o: xf86Build.h 40xf86Init.c xf86Init.o: xf86Build.h
42 41
43CLEANFILES+= xf86DefModeSet.c 42CLEANFILES+= xf86DefModeSet.c
44xf86DefModeSet.c: 43xf86DefModeSet.c:
45 ${_MKTARGET_CREATE} 44 ${_MKTARGET_CREATE}
46 cat \ 45 cat \
47 ${X11SRCDIR.xorg-server}/hw/xfree86/common/vesamodes \ 46 ${X11SRCDIR.xorg-server}/hw/xfree86/common/vesamodes \
48 ${X11SRCDIR.xorg-server}/hw/xfree86/common/extramodes | \ 47 ${X11SRCDIR.xorg-server}/hw/xfree86/common/extramodes | \
49 ${TOOL_AWK} -f ${X11SRCDIR.xorg-server}/hw/xfree86/common/modeline2c.awk > ${.TARGET} 48 ${TOOL_AWK} -f ${X11SRCDIR.xorg-server}/hw/xfree86/common/modeline2c.awk > ${.TARGET}
50 @echo >> ${.TARGET} 49 @echo >> ${.TARGET}
51 50
52CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ 51CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
53 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \ 52 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
54 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \ 53 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
55 -I${X11SRCDIR.xorg-server}/mfb \ 54 -I${X11SRCDIR.xorg-server}/mfb \
56 -I${X11SRCDIR.xorg-server}/mi \ 55 -I${X11SRCDIR.xorg-server}/mi \
57 -I${X11SRCDIR.xorg-server}/include \ 56 -I${X11SRCDIR.xorg-server}/include \
58 -I${X11SRCDIR.xorg-server}/os \ 57 -I${X11SRCDIR.xorg-server}/os \
59 -I${X11SRCDIR.xorg-server}/Xext \ 58 -I${X11SRCDIR.xorg-server}/Xext \
60 -I${DESTDIR}${X11INCDIR}/X11 \ 59 -I${DESTDIR}${X11INCDIR}/X11 \
61 -I${DESTDIR}${X11INCDIR}/X11/extensions \ 60 -I${DESTDIR}${X11INCDIR}/X11/extensions \
62 -I${DESTDIR}${X11INCDIR}/pixman-1 \ 61 -I${DESTDIR}${X11INCDIR}/pixman-1 \
63 -I${DESTDIR}${X11INCDIR}/xorg \ 62 -I${DESTDIR}${X11INCDIR}/xorg \
64 -I${X11SRCDIR.xorg-server}/Xi \ 63 -I${X11SRCDIR.xorg-server}/Xi \
65 -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \ 64 -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
66 -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \ 65 -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
67 -I${X11SRCDIR.xorg-server}/hw/xfree86/modes \ 66 -I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
68 -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \ 67 -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
69 -I${X11SRCDIR.xorg-server}/hw/xfree86 \ 68 -I${X11SRCDIR.xorg-server}/hw/xfree86 \
70 -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \ 69 -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
71 -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \ 70 -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
72 -I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \ 71 -I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
73 -I${X11SRCDIR.xorg-server}/hw/xfree86/rac \ 72 -I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
74 -I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \ 73 -I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
75 -I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \ 74 -I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
76 -I${X11SRCDIR.xorg-server}/render \ 75 -I${X11SRCDIR.xorg-server}/render \
77 -I${X11SRCDIR.xorg-server}/randr \ 76 -I${X11SRCDIR.xorg-server}/randr \
78 -I. \ 77 -I. \
79 -I${X11SRCDIR.xorg-server}/../include \ 78 -I${X11SRCDIR.xorg-server}/../include \
80 -D__${MACHINE} 79 -D__${MACHINE}
81 80
82CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \ 81CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
83 ${X11FLAGS.DIX} \ 82 ${X11FLAGS.DIX} \
84 -DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \ 83 -DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
85 -D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \ 84 -D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
86 -D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \ 85 -D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
87 -DXVENDORNAME='"The X.Org Foundation"' \ 86 -DXVENDORNAME='"The X.Org Foundation"' \
88 -DHAVE_XORG_CONFIG_H \ 87 -DHAVE_XORG_CONFIG_H \
89 -DHAVE_PCI_DEVICE_IS_BOOT_VGA 88 -DHAVE_PCI_DEVICE_IS_BOOT_VGA
90 89
91.if ${MACHINE_ARCH} == "i386" 90.if ${MACHINE_ARCH} == "i386"
92CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT 91CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
93.endif 92.endif
94 93
95.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc" 94.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
96CPPFLAGS+= -DPCVT_SUPPORT 95CPPFLAGS+= -DPCVT_SUPPORT
97.endif 96.endif
98 97
99OS_RELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh 98OS_RELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
100 99
101DRIVERS= mga glint nv tga s3 s3virge sis rendition neomagic \ 100DRIVERS= mga glint nv tga s3 s3virge sis rendition neomagic \
102 i740 tdfx savage cirrus vmware tseng trident chips \ 101 i740 tdfx savage cirrus vmware tseng trident chips \
103 apm i128 102 apm i128
104DRIVERS+= ati i810 ark cyrix siliconmotion via fbdev vesa \ 103DRIVERS+= ati i810 ark cyrix siliconmotion via fbdev vesa \
105 dummy 104 dummy
106 105
107IDRIVERS= mouse keyboard acecad calcomp citron digitaledge \ 106IDRIVERS= mouse keyboard acecad calcomp citron digitaledge \
108 dmc dynapro elographics tek4957 microtouch \ 107 dmc dynapro elographics tek4957 microtouch \
109 mutouch penmount spaceorb summa wacom void \ 108 mutouch penmount spaceorb summa wacom void \
110 magellan hyperpen jamstudio fpit palmax 109 magellan hyperpen jamstudio fpit palmax
111 110
112CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfree86@xfree86.org"' 111CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfree86@xfree86.org"'
113CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \ 112CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
114 -DXORG_RELEASE='"Release 1.4.2"' \ 113 -DXORG_RELEASE='"Release 1.4.2"' \
115 -DBUILDERADDR='"xorg@xorg.org"' \ 114 -DBUILDERADDR='"xorg@xorg.org"' \
116 -DOSVENDOR='" The NetBSD Foundation, Inc."' 115 -DOSVENDOR='" The NetBSD Foundation, Inc."'
117CPPFLAGS.xf86Globals.c= -DDEFAULT_LOGPREFIX='"/var/log/Xorg."' \ 116CPPFLAGS.xf86Globals.c= -DDEFAULT_LOGPREFIX='"/var/log/Xorg."' \
118 -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"' 117 -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"'
119CPPFLAGS.xf86Configure.c= -DXF86CONFIGFILE='"xorg.conf"' 118CPPFLAGS.xf86Configure.c= -DXF86CONFIGFILE='"xorg.conf"'
120CPPFLAGS.xf86Config.c= -DDRIVERS='"${DRIVERS}"' \ 119CPPFLAGS.xf86Config.c= -DDRIVERS='"${DRIVERS}"' \
121 -DIDRIVERS='"${IDRIVERS}"' \ 120 -DIDRIVERS='"${IDRIVERS}"' \
122 -DPROJECTROOT='"${X11ROOTDIR}"' 121 -DPROJECTROOT='"${X11ROOTDIR}"'
123CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT='"${X11ROOTDIR}"' \ 122CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT='"${X11ROOTDIR}"' \
124 -DBINDIR='"${X11BINDIR}"' \ 123 -DBINDIR='"${X11BINDIR}"' \
125 -DDRIVERS='"${DRIVERS}"' \ 124 -DDRIVERS='"${DRIVERS}"' \
126 -DIDRIVERS='"${IDRIVERS}"' 125 -DIDRIVERS='"${IDRIVERS}"'
127 126
128COPTS.xf86AutoConfig.c= -Wno-error 127COPTS.xf86AutoConfig.c= -Wno-error
129COPTS.xf86Config.c= -Wno-error 128COPTS.xf86Config.c= -Wno-error
130COPTS.xf86Cursor.c= -Wno-error 129COPTS.xf86Cursor.c= -Wno-error
131COPTS.xf86RandR.c= -Wno-error 130COPTS.xf86RandR.c= -Wno-error
132COPTS.xf86Helper.c= -Wno-error 131COPTS.xf86Helper.c= -Wno-error
133COPTS.xf86cmap.c= -Wno-error 132COPTS.xf86cmap.c= -Wno-error
134COPTS.xf86Cursor.c= -Wno-error # XXX xf86dgastr.h 133COPTS.xf86Cursor.c= -Wno-error # XXX xf86dgastr.h
135COPTS.xf86DGA.c= -Wno-error # XXX xf86dgastr.h 134COPTS.xf86DGA.c= -Wno-error # XXX xf86dgastr.h
136 135
137.include <bsd.x11.mk> 136.include <bsd.x11.mk>
138.include <bsd.lib.mk> 137.include <bsd.lib.mk>