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

* use LIBISPRIVATE instead of MKX11LOADABLE 

* reorganize SRCS into SRCS.mfb to make them available for the module build
* cleanup CPPFLAGS
* build libmfb.so module with more correct set of SRCS
This commit is contained in:
rtr 2008-08-24 13:30:20 +00:00
parent 7e73b6b74b
commit 7fa94bbc14
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb/Makefile vendored
View File

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

10
external/mit/xorg/server/xorg-server/mfb/Makefile vendored
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.1 2008/08/02 20:41:29 mrg Exp $
# $NetBSD: Makefile,v 1.2 2008/08/24 13:30:20 rtr Exp $
LIBISPRIVATE= yes
.include "../Makefile.serverlib"
.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
.endif
LIB= mfb
SRCS= ${SRCS.mfb}
.include "../Makefile.servermod"
.include "Makefile.mfb"

28
external/mit/xorg/server/xorg-server/mfb/Makefile.mfb vendored
View File

@ -1,20 +1,18 @@
# $NetBSD: Makefile.mfb,v 1.2 2008/08/15 15:55:06 rtr Exp $
# $NetBSD: Makefile.mfb,v 1.3 2008/08/24 13:30:20 rtr Exp $
LIB= mfb
.PATH: ${X11SRCDIR.xorg-server}/mfb
SRCS.mfb= mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c \
mfbtewhite.c mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c \
mfbbltO.c mfbbltG.c mfbtileC.c mfbtileG.c mfbplywhite.c \
mfbplyblack.c mfbplyinv.c mfbgc.c mfbwindow.c mfbfont.c \
mfbfillrct.c mfbpntwin.c maskbits.c mfbpixmap.c \
mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
mfbpushpxl.c mfbzerarc.c mfbfillarc.c mfbfillsp.c \
mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c mfbbitblt.c \
mfbgetsp.c mfbpolypnt.c mfbcmap.c mfbmisc.c mfbbstore.c
SRCS= mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \
mfbtileC.c mfbtileG.c mfbplywhite.c mfbplyblack.c mfbplyinv.c
SRCS+= mfbgc.c mfbwindow.c mfbfont.c \
mfbfillrct.c mfbpntwin.c maskbits.c mfbpixmap.c \
mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
mfbpushpxl.c mfbzerarc.c mfbfillarc.c \
mfbfillsp.c mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c \
mfbbitblt.c mfbgetsp.c mfbpolypnt.c \
mfbcmap.c mfbmisc.c mfbbstore.c
CPPFLAGS+= ${X11FLAGS.DIX}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/mfb \
-I${X11SRCDIR.xorg-server}/mi \
@ -27,8 +25,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/mfb \
# XXX some path so that "../../mfb/mfbblt.c" works
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} \
${X11FLAGS.DIX}
# XXX
COPTS.mfbclip.c+= -Wno-error