dont try to use things that couldnt possibly be defined -- cleanup

This commit is contained in:
rtr 2003-12-23 14:28:20 +00:00
parent d11a3aeebb
commit aa135873f2
8 changed files with 15 additions and 36 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 13:54:13 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -22,8 +22,6 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
-I${XSERVERINCDIR}
CPPFLAGS+= ${X11FLAGS.LOADABLE}
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 13:13:53 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -9,11 +9,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules
LIB= i2c
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB}
SRCS= xf86i2c.c
.if defined(X11FLAGS.LOADABLE)
SRCS+= xf86i2cmodule.c
.endif
SRCS= xf86i2c.c xf86i2cmodule.c
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 14:25:33 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -14,8 +14,8 @@ SRCS= pci.c xf86int10module.c helper_exec.c helper_mem.c xf86int10.c \
xf86x86emu.c generic.c debug.c decode.c fpu.c ops.c ops2.c \
prim_ops.c sys.c
CPPFLAGS+= ${X11FLAGS.LOADABLE} -D__DRIVER__ -DFORCE_POST \
-D_CEXPORT= -DNO_LONG_LONG -D_X86EMU -D_PC
CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \
-D_X86EMU -D_PC
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 13:44:57 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -29,8 +29,6 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
-I${XSERVERINCDIR}
CPPFLAGS+= ${X11FLAGS.LOADABLE}
CPPFLAGS.xf86PciData.c+= -DPCIDATA
BUILDSYMLINKS= xf86ScanPci.c xf86PciData.c \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 14:21:11 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -10,11 +10,7 @@ LIB= ramdac
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB}
SRCS= BT.c IBM.c TI.c xf86BitOrder.c xf86Cursor.c xf86HWCurs.c \
xf86RamDac.c xf86RamDacCmap.c
.if defined(X11FLAGS.LOADABLE)
SRCS+= xf86RamDacMod.c
.endif
xf86RamDac.c xf86RamDacCmap.c xf86RamDacMod.c
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 14:15:05 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -9,11 +9,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules
LIB= vbe
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB}
SRCS= vbe.c vbeModes.c
.if defined(X11FLAGS.LOADABLE)
SRCS+= vbe_module.c
.endif
SRCS= vbe.c vbeModes.c vbe_module.c
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 13:50:34 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:21 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -9,11 +9,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules
LIB= vgahw
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB}
SRCS= vgaHW.c
.if defined(X11FLAGS.LOADABLE)
SRCS+= vgaHWmodule.c
.endif
SRCS= vgaHW.c vgaHWmodule.c
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/22 13:16:07 rtr Exp $
# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:21 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@ -8,6 +8,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules
LIB= xaa
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB}
SRCS= lsb_fixed_xaaBitmap.c lsb_fixed_xaaBitmap3.c lsb_fixed_xaaStipple.c \
lsb_fixed_xaaStipple3.c lsb_fixed_xaaTEGlyph.c lsb_xaaBitmap.c \
lsb_xaaBitmap3.c lsb_xaaStipple.c lsb_xaaStipple3.c lsb_xaaTEGlyph.c \
@ -38,8 +39,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/programs/Xserver/render \
-I${XSERVERINCDIR}
CPPFLAGS+= ${X11FLAGS.LOADABLE}
CPPFLAGS.lsb_fixed_xaaBitmap.c= -DLSBFIRST -DFIXEDBASE
CPPFLAGS.lsb_fixed_xaaBitmap3.c= -DLSBFIRST -DFIXEDBASE -DTRIPLE_BITS
CPPFLAGS.lsb_fixed_xaaStipple.c= -DLSBFIRST -DFIXEDBASE