summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--external/mit/xorg/server/xorg-server/Makefile25
-rw-r--r--external/mit/xorg/server/xorg-server/composite/Makefile25
-rw-r--r--external/mit/xorg/server/xorg-server/config/Makefile20
-rw-r--r--external/mit/xorg/server/xorg-server/exa/Makefile22
4 files changed, 69 insertions, 23 deletions
diff --git a/external/mit/xorg/server/xorg-server/Makefile b/external/mit/xorg/server/xorg-server/Makefile
index 4b2a1b450bf..84890f51590 100644
--- a/external/mit/xorg/server/xorg-server/Makefile
+++ b/external/mit/xorg/server/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/08/02 21:19:21 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/02 21:44:14 mrg Exp $
.include <bsd.own.mk>
@@ -40,31 +40,10 @@ SUBDIR.iplan=iplan2p4 iplan2p8
SUBDIR.iplan=
.endif
-.if 0
-### this is the desired version ###
SUBDIR= doc include .WAIT
SUBDIR+= dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render
SUBDIR+= Xi xkb dbe mfb ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
-SUBDIR+= damageext XTrap composite exa config hw
-.else
-### this is the current working set
-SUBDIR= doc include .WAIT
-SUBDIR+= dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render
-# XXX need to test afb yet
-SUBDIR+= Xi xkb dbe mfb ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
-SUBDIR+= damageext XTrap
-#SUBDIR+= damageext XTrap composite exa config hw
-.endif
-
-.if 0
-### this is the old version
-SUBDIR= include
-SUBDIR+= .WAIT dix os mi printer Xext xkb xinput GL lbx dbe record
-SUBDIR+= mfb randr render xtrap composite damage xfixes
-SUBDIR+= ${SUBDIR.cfb} ${SUBDIR.fb} ${SUBDIR.iplan} hw
-SUBDIR+= ${SUBDIR.xfont} ${SUBDIR.afb} ${SUBDIR.miext}
-SUBDIR+= .WAIT Xserver
-.endif
+SUBDIR+= damageext XTrap composite exa config # hw
.PATH: ${X11SRCDIR.xorg-server}
diff --git a/external/mit/xorg/server/xorg-server/composite/Makefile b/external/mit/xorg/server/xorg-server/composite/Makefile
new file mode 100644
index 00000000000..cf7d4b0d8ab
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/composite/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2008/08/02 21:44:14 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= composite
+.PATH: ${X11SRCDIR.xorg-server}/composite
+
+SRCS= compalloc.c compext.c compint.h compinit.c compwindow.c
+
+CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} ${X11FLAGS.DIX} ${X11INCS.DIX}
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/render \
+ -I${X11SRCDIR.xorg-server}/xfixes \
+ -I${X11SRCDIR.xorg-server}/damageext \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include \
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/config/Makefile b/external/mit/xorg/server/xorg-server/config/Makefile
new file mode 100644
index 00000000000..4ec113ccef9
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/config/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2008/08/02 21:44:14 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= config
+.PATH: ${X11SRCDIR.xorg-server}/config
+
+SRCS= config.c
+
+CPPFLAGS+= ${X11FLAGS.DIX}
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/Xext \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/exa/Makefile b/external/mit/xorg/server/xorg-server/exa/Makefile
new file mode 100644
index 00000000000..674afb05fc1
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/exa/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2008/08/02 21:44:14 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= exa
+.PATH: ${X11SRCDIR.xorg-server}/exa
+
+SRCS= exa.c exa_accel.c exa_migration.c exa_offscreen.c \
+ exa_render.c exa_unaccel.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/fb \
+ -I${X11SRCDIR.xorg-server}/miext/cw \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>