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

* use LIBISPRIVATE instead of MKX11LOADABLE

Browse Source 
* reorganize SRCS into SRCS.shadow to make them available for the module build
* cleanup CPPFLAGS
* build libshadow.so module with more correct set of SRCS
This commit is contained in:
rtr 2008-08-24 13:37:33 +00:00
parent 7fa94bbc14
commit e09e7ba8f4
3 changed files with 27 additions and 25 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/shadow/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:37:33 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
LIB= shadow
SRCS= shmodule.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
SRCS= ${SRCS.shadow} shmodule.c
.include "../Makefile.dixmod"
.include "../../../../miext/shadow/Makefile.shadow"

11
external/mit/xorg/server/xorg-server/miext/shadow/Makefile vendored
View File

@ -1,11 +1,10 @@
# $NetBSD: Makefile,v 1.1 2008/08/02 04:32:00 mrg Exp $
# $NetBSD: Makefile,v 1.2 2008/08/24 13:37:33 rtr Exp $
LIBISPRIVATE= yes
.include "../../Makefile.serverlib"
.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
SRCS= shmodule.c
.endif
LIB= shadow
SRCS= ${SRCS.shadow}
.include "../../Makefile.servermod"
.include "Makefile.shadow"

29
external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow vendored
View File

@ -1,24 +1,21 @@
# $NetBSD: Makefile.shadow,v 1.2 2008/08/03 03:17:16 mrg Exp $
# $NetBSD: Makefile.shadow,v 1.3 2008/08/24 13:37:33 rtr Exp $
LIB= shadow
.PATH: ${X11SRCDIR.xorg-server}/miext/${LIB}
SRCS+= shadow.c shalloc.c shpacked.c shplanar8.c shplanar.c \
shrot16pack_180.c shrot16pack_270.c shrot16pack_270YX.c \
shrot16pack_90.c shrot16pack_90YX.c shrot16pack.c shrot32pack_180.c \
shrot32pack_270.c shrot32pack_90.c shrot32pack.c shrot8pack_180.c \
shrot8pack_270.c shrot8pack_90.c shrot8pack.c shrotate.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support
.PATH: ${X11SRCDIR.xorg-server}/miext/shadow
SRCS.shadow+= shadow.c shalloc.c shpacked.c shplanar8.c shplanar.c \
shrot16pack_180.c shrot16pack_270.c shrot16pack_270YX.c \
shrot16pack_90.c shrot16pack_90YX.c shrot16pack.c \
shrot32pack_180.c shrot32pack_270.c shrot32pack_90.c \
shrot32pack.c shrot8pack_180.c shrot8pack_270.c \
shrot8pack_90.c shrot8pack.c shrotate.c
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/miext/cw \
${X11FLAGS.DIX} ${X11INCS.DIX}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-I${X11SRCDIR.xorg-server}/miext/cw \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>