build all the dixmod parts, completing all the interesting subdirs

of hw/xfree86 i believe.
This commit is contained in:
mrg 2008-08-06 07:16:39 +00:00
parent cfee00cbb7
commit de486b6871
19 changed files with 227 additions and 9 deletions

View File

@ -1,4 +1,4 @@
$NetBSD: TODO,v 1.12 2008/08/06 06:14:33 mrg Exp $
$NetBSD: TODO,v 1.13 2008/08/06 07:16:39 mrg Exp $
plan:
- build modular-xorg stuff with reach over
@ -43,11 +43,11 @@ Xserver
GL XTrap Xext Xi afb cfb cfb32 composite config damageext dbe dix doc exa fb include mfb mi miext os randr record render xfixes xkb
- hw/xnest is done
- hw/vfb is done
- some of hw/xfree86 is done:
common ddc doc dri dummy exa i2c int10 loader modes os-support rac ramdac scanpci shadowfb utils vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp
- hw/xfree86 not done:
dixmods x86emu
- hw/xgl
- most of hw/xfree86 is done:
common ddc dixmods doc dri dummy exa i2c int10 loader modes os-support rac ramdac scanpci shadowfb utils vbe vgahw xaa x86emu xf1bpp xf4bpp xf8_16bpp xf8_32bpp
- need to make hw/xfree86 link Xorg
- hw/xgl is not done
- xorgcfg and xorgconfig are not done
things to delete:

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.8 2008/08/06 06:14:33 mrg Exp $
# $NetBSD: Makefile,v 1.9 2008/08/06 07:16:39 mrg Exp $
SUBDIR= common ddc doc dri dummy i2c int10 loader modes \
SUBDIR= common ddc dixmods doc dri dummy i2c int10 loader modes \
os-support rac ramdac scanpci shadowfb vbe vgahw \
xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp
x86emu xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp
SUBDIR+= .WAIT utils

View File

@ -0,0 +1,28 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:39 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
LIB= dixmods
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS= miinitext.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
-I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${XSERVERINCDIR}
CPPFLAGS+= -DXFree86LOADER
SUBDIR= extmod \
afb cfb cfb32 dbe fb freetype mfb record \
shadow type1 wfb xorgxkb xtrap
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>
.include <bsd.subdir.mk>

View File

@ -0,0 +1,29 @@
# $NetBSD: Makefile.dixmod,v 1.1 2008/08/06 07:16:40 mrg Exp $
.include <bsd.own.mk>
# XXX ? why?
MKPROFILE= no
MKPIC= no
MKLINT= no
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods \
-I${X11SRCDIR.xorg-server}/hw/xfree86/afb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/mfb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/cfb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${XSERVERINCDIR}
CPPFLAGS+= ${X11FLAGS.DIX} \
-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= afb
SRCS= afbmodule.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= cfb
SRCS= cfbmodule.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= cfb32
SRCS= cfb32module.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,9 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= dbe
SRCS= dbemodule.c
CPPFLAGS+= -DDBE
.include "../Makefile.dixmod"

View File

@ -0,0 +1,34 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
LIB= extmod
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
SRCS= xf86dga.c xf86dga2.c \
xvmod.c \
xf86misc.c \
xf86vmode.c \
modinit.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/afb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/mfb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/cfb \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
-I${X11SRCDIR.xorg-server}/hw/xfree86/hw/xfree86/loader \
-I${X11SRCDIR.xorg-server}/hw/xfree86/miext/shadow \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${XSERVERINCDIR}
CPPFLAGS+= ${X11FLAGS.DIX}
# XXX
CPPFLAGS.xf86RandR12.c= -Wno-error
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>

View File

@ -0,0 +1,9 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= afb
SRCS= fbmodule.c fbcmap_mi.c
.include "../Makefile.dixmod"
.PATH: ${X11SRCDIR.xorg-server}/fb

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= freetype
SRCS= ftmodule.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= mfb
SRCS= mfbmodule.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= record
SRCS= recordmod.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= shadow
SRCS= shmodule.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= type1
SRCS= type1mod.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,12 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= wfb
SRCS= fbmodule.c fbcmap_mi.c
CPPFLAGS+= -DFB_ACCESS_WRAPPER \
-I${X11SRCDIR.xorg-server}/fb
.include "../Makefile.dixmod"
.PATH: ${X11SRCDIR.xorg-server}/fb

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
LIB= xorgxkb
SRCS= xkbVT.c xkbPrivate.c xkbKillSrv.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:41 mrg Exp $
LIB= xtrap
SRCS= xf86XTrapModule.c
.include "../Makefile.dixmod"

View File

@ -0,0 +1,27 @@
# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:41 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
LIB= xf86emu
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/x86emu
SRCS= debug.c \
decode.c \
fpu.c \
ops2.c \
ops.c \
prim_ops.c \
sys.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${XSERVERINCDIR}
CPPFLAGS+= ${X11FLAGS.DIX}
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>