From d3349ca75f0ea2753ef5d8d115992199eee2da30 Mon Sep 17 00:00:00 2001 From: rtr Date: Mon, 1 Sep 2008 10:15:08 +0000 Subject: [PATCH] don't link libexa.a into the Xorg server. instead build the loadable module with the correct set of sources and they shall provide what is needed for the i830 driver at runtime. --- external/mit/xorg/server/xorg-server/Makefile | 4 ++-- .../xorg/server/xorg-server/Makefile.Xserver | 4 +--- .../server/xorg-server/hw/xfree86/Makefile | 4 +--- .../server/xorg-server/hw/xfree86/exa/Makefile | 18 +++--------------- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/external/mit/xorg/server/xorg-server/Makefile b/external/mit/xorg/server/xorg-server/Makefile index 163224d708a0..d612ae76b253 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.14 2008/08/09 04:39:49 mrg Exp $ +# $NetBSD: Makefile,v 1.15 2008/09/01 10:15:08 rtr Exp $ .include @@ -43,7 +43,7 @@ SUBDIR.iplan= 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 .WAIT +SUBDIR+= damageext XTrap composite config .WAIT SUBDIR+= hw # XXX stuff installed by modular-xorg-server we need to deal with: diff --git a/external/mit/xorg/server/xorg-server/Makefile.Xserver b/external/mit/xorg/server/xorg-server/Makefile.Xserver index 9518fff5fee1..029dec2c7e2e 100644 --- a/external/mit/xorg/server/xorg-server/Makefile.Xserver +++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xserver,v 1.5 2008/08/31 19:59:43 christos Exp $ +# $NetBSD: Makefile.Xserver,v 1.6 2008/09/01 10:15:08 rtr Exp $ # XXX old list .if 0 @@ -26,7 +26,6 @@ Xext \ Xext/Xextbuiltin \ dbe \ - exa \ XTrap \ record \ render \ @@ -64,7 +63,6 @@ hw/xfree86/doc \ hw/xfree86/dri \ hw/xfree86/dummy \ - hw/xfree86/exa \ hw/xfree86/i2c \ hw/xfree86/init \ hw/xfree86/int10 \ diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile index 745b326b8a6d..ebe8eb55befa 100644 --- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2008/08/31 19:59:43 christos Exp $ +# $NetBSD: Makefile,v 1.21 2008/09/01 10:15:08 rtr Exp $ SUBDIR= common init ddc dixmods doc dri dummy i2c int10 loader \ xf86modes \ @@ -40,10 +40,8 @@ LDADD+= -Wl,--whole-archive LDADD+= ${LDADD.dix} LDADD+= ${LDADD.hw/xfree86/init} LDADD+= ${LDADD.config} -LDADD+= ${LDADD.exa} LDADD+= ${LDADD.hw/xfree86/loader} LDADD+= ${LDADD.hw/xfree86/common} -LDADD+= ${LDADD.hw/xfree86/exa} LDADD+= ${LDADD.hw/xfree86/xorgos} #LDADD+= ${LDADD.osandcommon} LDADD+= ${LDADD.hw/xfree86/rac} diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile index 8c9414428dea..29b5e05aeff5 100644 --- a/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2008/09/01 10:15:08 rtr Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules @@ -9,22 +9,10 @@ LIB= exa MAN= exa.4 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/exa -SRCS= examodule.c - -CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ - -I${X11SRCDIR.xorg-server}/exa \ - -I${X11SRCDIR.xorg-server}/fb \ - -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ - -I${X11SRCDIR.xorg-server}/mi \ - -I${X11SRCDIR.xorg-server}/miext/damage \ - -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \ - -I${X11SRCDIR.xorg-server}/render \ - -I${DESTDIR}${X11INCDIR}/pixman-1 +SRCS= ${SRCS.exa} examodule.c # XXX exa.4: exa.man.pre cp ${.ALLSRC} ${.TARGET} -.include -LIBDIR= ${XMODULEDIR} -.include +.include "../../../exa/Makefile.exa"