* use LIBISPRIVATE instead of MKX11LOADABLE

* reorganize SRCS into SRCS.cfb32 to make them available for the module build
* cleanup CPPFLAGS
* build libcfb32.so module with more correct set of SRCS
This commit is contained in:
rtr 2008-08-24 13:24:12 +00:00
parent cdac501c2a
commit ef7ceee5bf
2 changed files with 16 additions and 11 deletions

View File

@ -1,13 +1,11 @@
# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
# $NetBSD: Makefile,v 1.2 2008/08/24 13:24:12 rtr Exp $
LIBISPRIVATE= yes
PIXELSIZE= 32
.include "../Makefile.serverlib"
PIXELSIZE= 32
LIB= cfb32
SRCS= ${SRCS.cfb}
.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
SRCS= cfbmodule32.c
.endif
.include "../Makefile.servermod"
.include "../cfb/Makefile.cfb"

View File

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