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

* use LIBISPRIVATE instead of MKX11LOADABLE 

* reorganize SRCS into SRCS.cfb to make them available for the module build
* cleanup CPPFLAGS
* build libcfb.so module with more correct set of SRCS
This commit is contained in:
rtr 2008-08-24 13:23:33 +00:00
parent c0b4306a0b
commit cdac501c2a
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
external/mit/xorg/server/xorg-server/cfb/Makefile vendored
View File

@ -1,13 +1,12 @@
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
# $NetBSD: Makefile,v 1.2 2008/08/24 13:23:33 rtr Exp $
LIBISPRIVATE= yes
PIXELSIZE= 8
.include "../Makefile.serverlib"
PIXELSIZE= 8
LIB= cfb
SRCS= ${SRCS.cfb}
.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
SRCS= cfbmodule.c
.endif
.include "../Makefile.servermod"
.include "Makefile.cfb"

17
external/mit/xorg/server/xorg-server/cfb/Makefile.cfb vendored
View File

@ -1,13 +1,7 @@
# $NetBSD: Makefile.cfb,v 1.2 2008/08/15 15:55:05 rtr Exp $
.if ${PIXELSIZE} == 8
LIB= cfb
.else
LIB= cfb${PIXELSIZE}
.endif
# $NetBSD: Makefile.cfb,v 1.3 2008/08/24 13:23:33 rtr Exp $
.PATH: ${X11SRCDIR.xorg-server}/cfb
SRCS+= cfbseg.c cfbfillarcC.c cfbfillarcG.c cfbzerarcC.c \
SRCS.cfb+= cfbseg.c cfbfillarcC.c cfbfillarcG.c cfbzerarcC.c \
cfbzerarcX.c cfbzerarcG.c cfbbltC.c cfbbltX.c \
cfbbltO.c cfbbltG.c cfbsolidC.c cfbsolidX.c \
cfbsolidG.c cfbtileoddC.c cfbtileoddG.c cfbtile32C.c \
@ -15,7 +9,7 @@ SRCS+= cfbseg.c cfbfillarcC.c cfbfillarcG.c cfbzerarcC.c \
cfb8lineG.c cfb8segCS.c cfb8segC.c cfb8segX.c \
cfb8setG.c cfbply1rctC.c cfbply1rctG.c
SRCS+= cfbgc.c cfbrrop.c cfbwindow.c cfbpntwin.c \
SRCS.cfb+= cfbgc.c cfbrrop.c cfbwindow.c cfbpntwin.c \
cfbmskbits.c cfbpixmap.c cfbbitblt.c cfbfillsp.c \
cfbsetsp.c cfbscrinit.c cfballpriv.c cfbgetsp.c \
cfbfillrct.c cfbigblt8.c cfbglblt8.c cfbtegblt.c \
@ -58,7 +52,7 @@ BUILDSYMLINKS= cfbline.c cfbseg.c \
.if ${PIXELSIZE} == 8 # {
SRCS+= cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c
SRCS.cfb+= cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c
.if 0
BUILDSYMLINKS+= cfbglblt8.c cfbglrop8.c
.endif
@ -81,8 +75,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/cfb \
# XXX some path so that "../../mfb/mfbblt.c" works
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86
CPPFLAGS+= -DPSZ=${PIXELSIZE} -DXFREE86 \
-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
CPPFLAGS+= -DPSZ=${PIXELSIZE} -DXFREE86
.if ${MACHINE} == "sparc64"

13
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile vendored
View File

@ -1,7 +1,14 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
# $NetBSD: Makefile,v 1.2 2008/08/24 13:23:33 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
PIXELSIZE= 8
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
LIB= cfb
SRCS= cfbmodule.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
SRCS= ${SRCS.cfb} cfbmodule.c
.include "../Makefile.dixmod"
.include "../../../../cfb/Makefile.cfb"