Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ cfbcmap.c is only for libcfb.a (8)

Browse Source 
+ use correct cfbmodule.c's for 8,16,24,32 libcfb respectively.

Resolves (remaining?) problems with xf86cfg.
This commit is contained in:
rtr 2004-03-03 16:11:45 +00:00
parent 5df6f3ecad
commit 2b884e11d4
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x11/Xserver/cfb/Makefile.cfb
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cfb,v 1.10 2004/02/13 04:49:00 mhitch Exp $
# $NetBSD: Makefile.cfb,v 1.11 2004/03/03 16:11:45 rtr Exp $
.include <bsd.own.mk>
@ -12,11 +12,11 @@ LIB= cfb
LIB= cfb${PIXELSIZE}
.endif
SRCS= cfb8lineCO.c cfb8lineCP.c cfb8lineG.c cfb8lineX.c \
SRCS+= cfb8lineCO.c cfb8lineCP.c cfb8lineG.c cfb8lineX.c \
cfb8segC.c cfb8segCS.c cfb8segG.c cfb8segX.c \
cfballpriv.c cfbbitblt.c cfbbltC.c cfbbltG.c \
cfbbltO.c cfbbltX.c cfbbres.c cfbbresd.c cfbbstore.c \
cfbcmap.c cfbcppl.c cfbfillarcC.c cfbfillarcG.c \
cfbcppl.c cfbfillarcC.c cfbfillarcG.c \
cfbfillrct.c cfbfillsp.c cfbgc.c cfbgetsp.c \
cfbglblt8.c cfbhrzvert.c cfbigblt8.c cfbimage.c \
cfbline.c cfbmskbits.c cfbpixmap.c cfbply1rctC.c \
@ -24,8 +24,9 @@ SRCS= cfb8lineCO.c cfb8lineCP.c cfb8lineG.c cfb8lineX.c \
cfbscrinit.c cfbseg.c cfbsetsp.c cfbsolidC.c \
cfbsolidG.c cfbsolidX.c cfbtegblt.c cfbtile32C.c \
cfbtile32G.c cfbtileoddC.c cfbtileoddG.c cfbwindow.c \
cfbzerarcC.c cfbzerarcG.c cfbzerarcX.c \
cfbmodule.c
cfbzerarcC.c cfbzerarcG.c cfbzerarcX.c
X11XSERVERDIR= ${X11SRCDIR.xc}/programs/Xserver
BUILDSYMLINKS= cfbline.c cfbseg.c \
cfbfillarc.c cfbfillarcC.c \
@ -53,7 +54,11 @@ BUILDSYMLINKS= cfbline.c cfbseg.c \
cfb8line.c cfb8segX.c \
cfb8line.c cfb8segG.c \
cfbply1rct.c cfbply1rctC.c \
cfbply1rct.c cfbply1rctG.c
cfbply1rct.c cfbply1rctG.c \
${X11XSERVERDIR}/cfb16/cfbmodule.c cfbmodule16.c \
${X11XSERVERDIR}/cfb24/cfbmodule.c cfbmodule24.c \
${X11XSERVERDIR}/cfb32/cfbmodule.c cfbmodule32.c
.if ${PIXELSIZE} == 8 # {
SRCS+= cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c

5
x11/Xserver/cfb/module/Makefile
View File

@ -1,7 +1,10 @@
# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
# $NetBSD: Makefile,v 1.2 2004/03/03 16:11:45 rtr Exp $
PIXELSIZE= 8
XMODULEDIR= ${X11ROOTDIR}/lib/modules
SRCS= cfbcmap.c cfbmodule.c
.include "../../Makefile.serverlib"
.include "../Makefile.cfb"

5
x11/Xserver/cfb16/module/Makefile
View File

@ -1,7 +1,10 @@
# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
# $NetBSD: Makefile,v 1.2 2004/03/03 16:11:45 rtr Exp $
PIXELSIZE= 16
XMODULEDIR= ${X11ROOTDIR}/lib/modules
SRCS= cfbmodule16.c
.include "../../Makefile.serverlib"
.include "../../cfb/Makefile.cfb"

4
x11/Xserver/cfb24/module/Makefile
View File

@ -1,7 +1,9 @@
# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
# $NetBSD: Makefile,v 1.2 2004/03/03 16:11:45 rtr Exp $
PIXELSIZE= 24
XMODULEDIR= ${X11ROOTDIR}/lib/modules
SRCS= cfbmodule24.c
.include "../../Makefile.serverlib"
.include "../../cfb/Makefile.cfb"

4
x11/Xserver/cfb32/module/Makefile
View File

@ -1,7 +1,9 @@
# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
# $NetBSD: Makefile,v 1.2 2004/03/03 16:11:45 rtr Exp $
PIXELSIZE= 32
XMODULEDIR= ${X11ROOTDIR}/lib/modules
SRCS= cfbmodule32.c
.include "../../Makefile.serverlib"
.include "../../cfb/Makefile.cfb"