From 8d125fd0e6fe3590c70b6c6520b950a36563b1e6 Mon Sep 17 00:00:00 2001 From: lukem Date: Sat, 7 Feb 2004 06:52:04 +0000 Subject: [PATCH] Cache XSERVERLIB determination in Makefile.serverlib rather than in 111 separate places. Speeds up empty "cleandir" from 27.17s to 13.75s. --- x11/Xserver/GL/GLcore/Makefile.GLcore | 6 +----- x11/Xserver/GL/glx/Makefile.glx | 6 +----- x11/Xserver/Makefile.serverlib | 9 +++++++-- x11/Xserver/Xext/Makefile.ext | 6 +----- x11/Xserver/Xfont/bitmap/Makefile | 6 +----- x11/Xserver/Xfont/freetype/Makefile | 6 +----- x11/Xserver/Xfont/speedo/Makefile | 6 +----- x11/Xserver/Xfont/type1/Makefile | 6 +----- x11/Xserver/Xfont/xtt/Makefile | 6 +----- x11/Xserver/afb/Makefile | 6 +----- x11/Xserver/cfb/Makefile.cfb | 4 +--- x11/Xserver/dbe/Makefile.dbe | 6 +----- x11/Xserver/dix/Makefile | 4 +--- x11/Xserver/fb/Makefile.fb | 6 +----- x11/Xserver/hw/netbsd/alpha/Makefile | 6 +----- x11/Xserver/hw/netbsd/amiga/Makefile | 6 +----- x11/Xserver/hw/netbsd/arm32vidc/Makefile | 6 +----- x11/Xserver/hw/netbsd/dec/Makefile | 6 +----- x11/Xserver/hw/netbsd/hpc/Makefile | 6 +----- x11/Xserver/hw/netbsd/mac68k/Makefile | 6 +----- x11/Xserver/hw/netbsd/macppc/Makefile | 6 +----- x11/Xserver/hw/netbsd/pmax/Makefile | 6 +----- x11/Xserver/hw/netbsd/x68k/Makefile | 6 +----- x11/Xserver/hw/sun/Makefile | 6 +----- x11/Xserver/hw/vfb/Makefile | 6 +----- x11/Xserver/hw/xfree86/ddc/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/apm/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/ark/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/ati/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/atimisc/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/chips/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/cirrus/Makefile | 6 +----- .../xfree86/drivers/cirrus/cirrus_alpine/Makefile | 6 +----- .../xfree86/drivers/cirrus/cirrus_laguna/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/cyrix/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/dummy/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/fbdev/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/glint/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/i128/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/i740/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/i810/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/imstt/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/mga/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/neomagic/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/newport/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/nsc/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/nv/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/r128/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/radeon/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/rendition/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/s3/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/s3virge/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/savage/Makefile | 6 +----- .../hw/xfree86/drivers/siliconmotion/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/sis/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/tdfx/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/tga/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/trident/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/tseng/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/vesa/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/vga/Makefile | 6 +----- x11/Xserver/hw/xfree86/drivers/vmware/Makefile | 6 +----- x11/Xserver/hw/xfree86/dummy/Makefile | 6 +----- x11/Xserver/hw/xfree86/i2c/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/calcomp/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/citron/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/digitaledge/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/dmc/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/dynapro/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/elographics/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/fpit/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/hyperpen/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/js_x/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/kbd/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/magellan/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/microtouch/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/mouse/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/mutouch/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/palmax/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/penmount/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/spaceorb/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/summa/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/tek4957/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/void/Makefile | 6 +----- x11/Xserver/hw/xfree86/input/wacom/Makefile | 6 +----- x11/Xserver/hw/xfree86/int10/Makefile | 6 +----- x11/Xserver/hw/xfree86/loader/Makefile | 6 +----- x11/Xserver/hw/xfree86/pcidata/Makefile | 6 +----- x11/Xserver/hw/xfree86/rac/Makefile | 6 +----- x11/Xserver/hw/xfree86/ramdac/Makefile | 6 +----- x11/Xserver/hw/xfree86/scanpci/Makefile | 5 +---- x11/Xserver/hw/xfree86/shadowfb/Makefile | 6 +----- x11/Xserver/hw/xfree86/vbe/Makefile | 6 +----- x11/Xserver/hw/xfree86/vgahw/Makefile | 6 +----- x11/Xserver/hw/xfree86/xaa/Makefile | 6 +----- x11/Xserver/hw/xfree86/xf1bpp/Makefile | 6 +----- x11/Xserver/hw/xfree86/xf24_32bpp/Makefile | 6 +----- x11/Xserver/hw/xfree86/xf4bpp/Makefile | 6 +----- x11/Xserver/hw/xfree86/xf86/Makefile | 15 +++++++-------- x11/Xserver/hw/xfree86/xf86_os/Makefile | 6 +----- x11/Xserver/hw/xfree86/xf8_16bpp/Makefile | 6 +----- x11/Xserver/hw/xfree86/xf8_32bpp/Makefile | 6 +----- x11/Xserver/hw/xfree86/xloader/Makefile | 6 +----- x11/Xserver/hw/xnest/Makefile | 6 +----- x11/Xserver/mfb/Makefile.mfb | 6 +----- x11/Xserver/miext/layer/Makefile | 6 +----- x11/Xserver/miext/shadow/Makefile | 6 +----- x11/Xserver/os/Makefile | 6 +----- x11/Xserver/randr/Makefile | 6 +----- x11/Xserver/record/Makefile.record | 6 +----- x11/Xserver/render/Makefile | 6 +----- x11/Xserver/xkb/Makefile | 6 +----- x11/Xserver/xtrap/Makefile.xtrap | 6 +----- 113 files changed, 125 insertions(+), 560 deletions(-) diff --git a/x11/Xserver/GL/GLcore/Makefile.GLcore b/x11/Xserver/GL/GLcore/Makefile.GLcore index 997dcb20f06a..f295e954c050 100644 --- a/x11/Xserver/GL/GLcore/Makefile.GLcore +++ b/x11/Xserver/GL/GLcore/Makefile.GLcore @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.GLcore,v 1.2 2003/12/21 11:12:32 rtr Exp $ - -.include +# $NetBSD: Makefile.GLcore,v 1.3 2004/02/07 06:52:04 lukem Exp $ LIB= GLcore @@ -51,8 +49,6 @@ SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \ SRCS+= compsize.c xf86glx.c xf86glx_util.c xm_api.c xm_dd.c \ xm_line.c xm_span.c xm_tri.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${X11SRCDIR.xc}/extras/Mesa/include \ diff --git a/x11/Xserver/GL/glx/Makefile.glx b/x11/Xserver/GL/glx/Makefile.glx index 7f4803dde69a..23312359561e 100644 --- a/x11/Xserver/GL/glx/Makefile.glx +++ b/x11/Xserver/GL/glx/Makefile.glx @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.glx,v 1.3 2003/12/19 15:23:43 rtr Exp $ - -.include +# $NetBSD: Makefile.glx,v 1.4 2004/02/07 06:52:04 lukem Exp $ LIB= glx .PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/${LIB} @@ -13,8 +11,6 @@ SRCS+= g_disptab.c g_disptab_EXT.c g_render.c g_renderswap.c \ single2.c single2swap.c singlepix.c singlepixswap.c \ singlesize.c xfont.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/glx \ -I${X11SRCDIR.xc}/programs/Xserver/GL/include \ -I${X11SRCDIR.xc}/programs/Xserver/include \ diff --git a/x11/Xserver/Makefile.serverlib b/x11/Xserver/Makefile.serverlib index 3e172f3df494..dede6aa5726d 100644 --- a/x11/Xserver/Makefile.serverlib +++ b/x11/Xserver/Makefile.serverlib @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.serverlib,v 1.4 2004/01/06 12:30:13 mrg Exp $ - +# $NetBSD: Makefile.serverlib,v 1.5 2004/02/07 06:52:04 lukem Exp $ NOLINT= 1 NOPIC= 1 NOPROFILE= 1 +.include # for NETBSDSRCDIR .include .if ${XMODULEDIR:U} == "" @@ -21,6 +21,11 @@ X_BYTE_ORDER=0 CPPFLAGS+= ${X11FLAGS.SERVER} -DX_BYTE_ORDER=${X_BYTE_ORDER} +.if !defined(XSERVERINCDIR) +XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} +.MAKEOVERRIDES+=XSERVERINCDIR +.endif + .if defined(XMODULEDIR) CPPFLAGS+= ${X11FLAGS.LOADABLE} .endif diff --git a/x11/Xserver/Xext/Makefile.ext b/x11/Xserver/Xext/Makefile.ext index a8ae8b31c577..a104f961c0f6 100644 --- a/x11/Xserver/Xext/Makefile.ext +++ b/x11/Xserver/Xext/Makefile.ext @@ -1,11 +1,7 @@ -# $NetBSD: Makefile.ext,v 1.6 2004/01/25 02:19:38 rtr Exp $ - -.include +# $NetBSD: Makefile.ext,v 1.7 2004/02/07 06:52:04 lukem Exp $ .PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/Xext \ -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ diff --git a/x11/Xserver/Xfont/bitmap/Makefile b/x11/Xserver/Xfont/bitmap/Makefile index c6dfbf935a9a..85004d6c5d8b 100644 --- a/x11/Xserver/Xfont/bitmap/Makefile +++ b/x11/Xserver/Xfont/bitmap/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/23 10:04:14 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/fonts .include "../../Makefile.serverlib" -.include - LIB= bitmap .PATH: ${X11SRCDIR.xc}/lib/font/bitmap .PATH: ${X11SRCDIR.xc}/lib/font/bitmap/module @@ -13,8 +11,6 @@ LIB= bitmap SRCS= bdfread.c bdfutils.c bitmap.c bitmaputil.c bitscale.c bitmapfunc.c \ pcfread.c pcfwrite.c snfread.c fontink.c bitmapmod.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/include/fonts \ -I${X11SRCDIR.xc}/lib/font/include \ -I${DESTDIR}${X11INCDIR}/X11 \ diff --git a/x11/Xserver/Xfont/freetype/Makefile b/x11/Xserver/Xfont/freetype/Makefile index a30d9c6fe6ad..148f0cb4fb48 100644 --- a/x11/Xserver/Xfont/freetype/Makefile +++ b/x11/Xserver/Xfont/freetype/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/23 10:04:14 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/fonts .include "../../Makefile.serverlib" -.include - LIB= freetype .PATH: ${X11SRCDIR.xc}/lib/font/FreeType .PATH: ${X11SRCDIR.xc}/lib/font/FreeType/module @@ -24,8 +22,6 @@ SRCS= ftfuncs.c ftenc.c fttools.c ftbase.c ftinit.c ftglyph.c ftsystem.c \ fttype1.c ftxf86.c raster.c sfnt.c truetype.c cff.c type1.c \ psaux.c psnames.c pshinter.c autohint.c ftmodule.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/lib/font/FreeType \ -I${X11SRCDIR.xc}/include/fonts \ -I${X11SRCDIR.xc}/lib/font/include \ diff --git a/x11/Xserver/Xfont/speedo/Makefile b/x11/Xserver/Xfont/speedo/Makefile index d7dd3ef287e1..c826b4bd8015 100644 --- a/x11/Xserver/Xfont/speedo/Makefile +++ b/x11/Xserver/Xfont/speedo/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/06 14:12:36 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/fonts .include "../../Makefile.serverlib" -.include - LIB= speedo .PATH: ${X11SRCDIR.xc}/lib/font/Speedo .PATH: ${X11SRCDIR.xc}/lib/font/Speedo/module @@ -14,8 +12,6 @@ SRCS= spfuncs.c spfile.c spinfo.c sperr.c spfont.c spglyph.c spencode.c \ bics-unicode.c do_char.c do_trns.c out_bl2d.c out_blk.c out_scrn.c \ out_util.c reset.c set_spcs.c set_trns.c speedomod.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/include/fonts \ -I${X11SRCDIR.xc}/lib/font/include \ -I${X11SRCDIR.xc}/programs/Xserver/include \ diff --git a/x11/Xserver/Xfont/type1/Makefile b/x11/Xserver/Xfont/type1/Makefile index 84024496d4e0..b04436bf27a3 100644 --- a/x11/Xserver/Xfont/type1/Makefile +++ b/x11/Xserver/Xfont/type1/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/23 10:04:14 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/fonts .include "../../Makefile.serverlib" -.include - LIB= type1 .PATH: ${X11SRCDIR.xc}/lib/font/Type1 .PATH: ${X11SRCDIR.xc}/lib/font/Type1/module @@ -15,8 +13,6 @@ SRCS= arith.c curves.c fontfcn.c hints.c lines.c objects.c paths.c \ t1snap.c t1stub.c token.c type1.c util.c cidchar.c afm.c \ t1unicode.c type1mod.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/include/fonts \ -I${X11SRCDIR.xc}/lib/font/include \ -I${DESTDIR}${X11INCDIR}/X11 \ diff --git a/x11/Xserver/Xfont/xtt/Makefile b/x11/Xserver/Xfont/xtt/Makefile index 0c2b309af569..7ba13ad451ae 100644 --- a/x11/Xserver/Xfont/xtt/Makefile +++ b/x11/Xserver/Xfont/xtt/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/06 06:46:51 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/fonts .include "../../Makefile.serverlib" -.include - LIB= xtt .PATH: ${X11SRCDIR.xc}/lib/font/X-TrueType .PATH: ${X11SRCDIR.xc}/extras/X-TrueType @@ -17,8 +15,6 @@ LIB= xtt SRCS= xttprop.c xttfuncs.c xttcconv.c xttcap.c xttmisc.c xttblit.c \ freetype.c ftxcmap.c ftxsbit.c xttmodule.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts/codeconv \ -I${X11SRCDIR.xc}/extras/FreeType/lib \ -I${X11SRCDIR.xc}/extras/FreeType/lib/extend \ diff --git a/x11/Xserver/afb/Makefile b/x11/Xserver/afb/Makefile index b8296d3365a8..cd33c00cab27 100644 --- a/x11/Xserver/afb/Makefile +++ b/x11/Xserver/afb/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2004/01/13 15:55:14 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:04 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../Makefile.serverlib" -.include - LIB= afb .PATH: ${X11SRCDIR.xc}/programs/Xserver/${LIB} @@ -22,8 +20,6 @@ SRCS= afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c \ SRCS+= afbmodule.c .endif -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/cfb \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ diff --git a/x11/Xserver/cfb/Makefile.cfb b/x11/Xserver/cfb/Makefile.cfb index 0ce045368e07..c46e36af5f01 100644 --- a/x11/Xserver/cfb/Makefile.cfb +++ b/x11/Xserver/cfb/Makefile.cfb @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cfb,v 1.8 2004/01/25 02:21:23 rtr Exp $ +# $NetBSD: Makefile.cfb,v 1.9 2004/02/07 06:52:05 lukem Exp $ .include @@ -60,8 +60,6 @@ SRCS+= cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c BUILDSYMLINKS+= cfbglblt8.c cfbglrop8.c .endif # } -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/cfb \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/dbe/Makefile.dbe b/x11/Xserver/dbe/Makefile.dbe index 7a0c0a5dfa5d..cfe411905a14 100644 --- a/x11/Xserver/dbe/Makefile.dbe +++ b/x11/Xserver/dbe/Makefile.dbe @@ -1,14 +1,10 @@ -# $NetBSD: Makefile.dbe,v 1.2 2003/09/30 06:41:29 lukem Exp $ - -.include +# $NetBSD: Makefile.dbe,v 1.3 2004/02/07 06:52:05 lukem Exp $ LIB= dbe .PATH: ${X11SRCDIR.xc}/programs/Xserver/${LIB} SRCS+= dbe.c midbe.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${DESTDIR}${X11INCDIR}/X11 \ diff --git a/x11/Xserver/dix/Makefile b/x11/Xserver/dix/Makefile index abfda5b00ea1..b690b1876e57 100644 --- a/x11/Xserver/dix/Makefile +++ b/x11/Xserver/dix/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2004/02/06 11:58:56 rtr Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/07 06:52:05 lukem Exp $ .include "../Makefile.serverlib" -.include - LIB= dix .PATH: ${X11SRCDIR.xc}/programs/Xserver/dix diff --git a/x11/Xserver/fb/Makefile.fb b/x11/Xserver/fb/Makefile.fb index 6a9aebb4dfd9..f5edd1ff9ef3 100644 --- a/x11/Xserver/fb/Makefile.fb +++ b/x11/Xserver/fb/Makefile.fb @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.fb,v 1.1 2003/12/21 03:07:01 rtr Exp $ - -.include +# $NetBSD: Makefile.fb,v 1.2 2004/02/07 06:52:05 lukem Exp $ LIB= fb .PATH: ${X11SRCDIR.xc}/programs/Xserver/fb @@ -13,8 +11,6 @@ SRCS= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \ fbseg.c fbsetsp.c fbsolid.c fbstipple.c fbtile.c \ fbtrap.c fbutil.c fbwindow.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/fb \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ -I${X11SRCDIR.xc}/programs/Xserver/include \ diff --git a/x11/Xserver/hw/netbsd/alpha/Makefile b/x11/Xserver/hw/netbsd/alpha/Makefile index c74518fbc19f..4448afef4d44 100644 --- a/x11/Xserver/hw/netbsd/alpha/Makefile +++ b/x11/Xserver/hw/netbsd/alpha/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= alpha .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha @@ -28,8 +26,6 @@ CPPFLAGS.tga32bitblt.c= -DPSZ=32 CPPFLAGS.tga32blt.c= -DPSZ=32 CPPFLAGS.tga32window.c= -DPSZ=32 -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha \ -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha/sfb \ -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha/tga \ diff --git a/x11/Xserver/hw/netbsd/amiga/Makefile b/x11/Xserver/hw/netbsd/amiga/Makefile index cbe027924ad6..da22dfbd18b6 100644 --- a/x11/Xserver/hw/netbsd/amiga/Makefile +++ b/x11/Xserver/hw/netbsd/amiga/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2004/01/25 05:20:02 mhitch Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= amiga .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/amiga @@ -36,8 +34,6 @@ CPPFLAGS.${_FN}= -DUSE_IMAGE_WRITE -DUSE_FONTCACHE SRCS+= ${SRCS.s3} -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/amiga \ -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/amiga/cirrus \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/hw/netbsd/arm32vidc/Makefile b/x11/Xserver/hw/netbsd/arm32vidc/Makefile index d9272fa25f3b..8820d536b592 100644 --- a/x11/Xserver/hw/netbsd/arm32vidc/Makefile +++ b/x11/Xserver/hw/netbsd/arm32vidc/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= arm32vidc .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/arm32vidc SRCS= vidc.c rpccons.c wscons.c arm32vidcInEx.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/arm32vidc \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/hw/netbsd/dec/Makefile b/x11/Xserver/hw/netbsd/dec/Makefile index 9869cbee89c6..c1e394c5612a 100644 --- a/x11/Xserver/hw/netbsd/dec/Makefile +++ b/x11/Xserver/hw/netbsd/dec/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= dec .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec @@ -55,8 +53,6 @@ BUILDSYMLINKS= tgagc.c tga32gc.c \ .endif -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec \ -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/sfb \ -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/px \ diff --git a/x11/Xserver/hw/netbsd/hpc/Makefile b/x11/Xserver/hw/netbsd/hpc/Makefile index 774bbb4a65fb..8792d341ddde 100644 --- a/x11/Xserver/hw/netbsd/hpc/Makefile +++ b/x11/Xserver/hw/netbsd/hpc/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2004/01/10 16:28:29 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= hpc .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/hpc @@ -11,8 +9,6 @@ SRCS= hpc.h xf86Keymap.h atKeynames.h \ hpcFB.c hpcIo.c hpcKeymap.c hpcScreen.c \ hpcInit.c hpcKbd.c hpcMouse.c hpcColormap.c hpcInEx.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - # trim fonts / extentions / XSERVERINCDIR if possible CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/hpc \ -I${X11SRCDIR.xc}/programs/Xserver \ diff --git a/x11/Xserver/hw/netbsd/mac68k/Makefile b/x11/Xserver/hw/netbsd/mac68k/Makefile index 804c23ab27ba..88614a267555 100644 --- a/x11/Xserver/hw/netbsd/mac68k/Makefile +++ b/x11/Xserver/hw/netbsd/mac68k/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2004/01/10 04:34:33 fredb Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= mac68k .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/mac68k SRCS= mac68kEvent.c mac68kInit.c mac68kKbd.c mac68kKeyMap.c mac68k.h \ mac68kMouse.c mac68kMonoScreens.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - # trim fonts / extentions / XSERVERINCDIR if possible CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/mac68k \ -I${X11SRCDIR.xc}/programs/Xserver \ diff --git a/x11/Xserver/hw/netbsd/macppc/Makefile b/x11/Xserver/hw/netbsd/macppc/Makefile index aac17f6ee97b..ee08a8dc00ac 100644 --- a/x11/Xserver/hw/netbsd/macppc/Makefile +++ b/x11/Xserver/hw/netbsd/macppc/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.3 2004/01/10 16:28:29 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= macppc .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/macppc SRCS= macppcFbs.c macppcIo.c macppcKeyMap.c macppcOFB.c macppc.h \ macppcInit.c macppcKbd.c macppcMouse.c macppcInEx.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/macppc \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/hw/netbsd/pmax/Makefile b/x11/Xserver/hw/netbsd/pmax/Makefile index 401d93874365..4d4c111ace97 100644 --- a/x11/Xserver/hw/netbsd/pmax/Makefile +++ b/x11/Xserver/hw/netbsd/pmax/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.1 2004/01/10 05:26:14 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= pmax .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/pmax SRCS= pmax_init.c pmax_io.c lk201.c pmaxInEx.c GetTime.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ -I${X11SRCDIR.xc}/programs/Xserver/cfb \ diff --git a/x11/Xserver/hw/netbsd/x68k/Makefile b/x11/Xserver/hw/netbsd/x68k/Makefile index 64ed8e0911f4..d4d1d3594d20 100644 --- a/x11/Xserver/hw/netbsd/x68k/Makefile +++ b/x11/Xserver/hw/netbsd/x68k/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2004/01/07 13:02:27 minoura Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= x68k .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/x68k SRCS= x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \ x68kFb.c x68kGraph.c x68kText.c x68kInEx.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - # trim fonts / extentions / XSERVERINCDIR if possible CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/x68k \ -I${X11SRCDIR.xc}/programs/Xserver \ diff --git a/x11/Xserver/hw/sun/Makefile b/x11/Xserver/hw/sun/Makefile index 853e31bef258..8edd5e9c2d4e 100644 --- a/x11/Xserver/hw/sun/Makefile +++ b/x11/Xserver/hw/sun/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2004/01/05 13:19:17 rtr Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:05 lukem Exp $ SUBDIR= bin/constype bin/kbd_mode .include "../../Makefile.serverlib" -.include - LIB= sun .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/sun @@ -13,8 +11,6 @@ SRCS= sunInit.c sunCfb.c sunCfb24.c sunCursor.c sunFbs.c sunIo.c sunKbd.c \ sunMfb.c sunMouse.c sunKeyMap.c sunGX.c sunInExMono.c sunInitExt.c \ stubs.c sunInitMono.c sunInitMulti.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/sun \ -I${X11SRCDIR.xc}/programs/Xserver \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/hw/vfb/Makefile b/x11/Xserver/hw/vfb/Makefile index 1062a245fda7..6b47ff96df83 100644 --- a/x11/Xserver/hw/vfb/Makefile +++ b/x11/Xserver/hw/vfb/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2004/01/11 08:30:42 rtr Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/07 06:52:05 lukem Exp $ .include "../../Makefile.serverlib" -.include - LIB= vfb .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/vfb .PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext @@ -12,8 +10,6 @@ LIB= vfb SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xc}/include/fonts \ -I${X11SRCDIR.xc}/programs/Xserver/fb \ diff --git a/x11/Xserver/hw/xfree86/ddc/Makefile b/x11/Xserver/hw/xfree86/ddc/Makefile index dab4ac153d59..e00f6e3cf3a3 100644 --- a/x11/Xserver/hw/xfree86/ddc/Makefile +++ b/x11/Xserver/hw/xfree86/ddc/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= ddc .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= ddcProperty.c edid.c interpret_edid.c interpret_vdif.c \ print_edid.c print_vdif.c xf86DDC.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/apm/Makefile b/x11/Xserver/hw/xfree86/drivers/apm/Makefile index 5c3a1e27391b..c3fbc098174c 100644 --- a/x11/Xserver/hw/xfree86/drivers/apm/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/apm/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:34 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= apm_drv MAN= apm.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/apm SRCS= apm_accel.c apm_cursor.c apm_dga.c apm_driver.c apm_i2c.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/apm \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/ark/Makefile b/x11/Xserver/hw/xfree86/drivers/ark/Makefile index 23908dab4e2d..a27219bc1c16 100644 --- a/x11/Xserver/hw/xfree86/drivers/ark/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/ark/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 14:53:10 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= ark_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ark SRCS= ark_driver.c ark_accel.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ark \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/ati/Makefile b/x11/Xserver/hw/xfree86/drivers/ati/Makefile index 272e84546f21..0bb096fac279 100644 --- a/x11/Xserver/hw/xfree86/drivers/ati/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/ati/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:34 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= ati_drv MAN= ati.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati @@ -14,8 +12,6 @@ SRCS= ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \ atiprobe.c atividmem.c ativgaio.c atimodule.c radeon_probe.c \ r128_probe.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile b/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile index 602c9040e38e..75b32ceb3ced 100644 --- a/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 14:53:10 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= atimisc_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati @@ -16,8 +14,6 @@ SRCS= atiaccel.c atiadjust.c aticlock.c aticonfig.c aticonsole.c \ ativalid.c atixv.c atibank.c ativga.c atiwonder.c atiwonderio.c \ atidga.c atiload.c atimisc.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/chips/Makefile b/x11/Xserver/hw/xfree86/drivers/chips/Makefile index a99ba150ca9c..142dbe89e718 100644 --- a/x11/Xserver/hw/xfree86/drivers/chips/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/chips/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= chips_drv MAN= chips.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips @@ -13,8 +11,6 @@ MAN= chips.4 SRCS= ct_driver.c ct_bank.c ct_accel.c ct_accelmm.c ct_accelhi.c \ ct_cursor.c ct_ddc.c ct_regs.c ct_dga.c ct_shadow.c ct_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/cirrus/Makefile b/x11/Xserver/hw/xfree86/drivers/cirrus/Makefile index 76ad621c6e51..e774184f9110 100644 --- a/x11/Xserver/hw/xfree86/drivers/cirrus/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/cirrus/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.3 2004/01/05 05:31:12 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= cirrus_drv MAN= cirrus.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus SRCS= cir_driver.c CirrusClk.c cir_shadow.c cir_dga.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile b/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile index 49c4c8f95bfd..e4c1a43546cd 100644 --- a/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 05:31:12 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../../Makefile.serverlib" -.include - MODULE= cirrus_alpine MAN= #defined @@ -13,8 +11,6 @@ MAN= #defined SRCS= alp_driver.c alp_xaa.c alp_hwcurs.c alp_i2c.c alp_xaam.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile b/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile index b2251905bb64..f188ed120d11 100644 --- a/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 05:31:12 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../../Makefile.serverlib" -.include - MODULE= cirrus_laguna MAN= #defined @@ -13,8 +11,6 @@ MAN= #defined SRCS= lg_driver.c lg_i2c.c lg_xaa.c lg_hwcurs.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/cyrix/Makefile b/x11/Xserver/hw/xfree86/drivers/cyrix/Makefile index b46cdebe6f9b..4e6402824fae 100644 --- a/x11/Xserver/hw/xfree86/drivers/cyrix/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/cyrix/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= cyrix_drv MAN= cyrix.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cyrix SRCS= cyrix_driver.c cyrix_accel.c cyrix_bank.c cyrix_helper.c cyrix_shadow.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cyrix \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/dummy/Makefile b/x11/Xserver/hw/xfree86/drivers/dummy/Makefile index 57a3526f5f1b..729ad4b5ac52 100644 --- a/x11/Xserver/hw/xfree86/drivers/dummy/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/dummy/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 14:53:10 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= dummy_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy SRCS= dummy_driver.c dummy_cursor.c dummy_dga.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/fbdev/Makefile b/x11/Xserver/hw/xfree86/drivers/fbdev/Makefile index ed5b9da84124..debd915e5d42 100644 --- a/x11/Xserver/hw/xfree86/drivers/fbdev/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/fbdev/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= fbdev_drv MAN= fbdev.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/fbdev SRCS= fbdev.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/fbdev \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/glint/Makefile b/x11/Xserver/hw/xfree86/drivers/glint/Makefile index 719e7e6c9c9c..f9cb6798b90b 100644 --- a/x11/Xserver/hw/xfree86/drivers/glint/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/glint/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= glint_drv MAN= glint.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/glint @@ -15,8 +13,6 @@ SRCS= glint_driver.c pm2_dac.c pm2ramdac.c pm2_accel.c pm_dac.c \ pm2vramdac.c pm2_video.c pm3_dac.c pm3_accel.c pm3_video.c \ TIramdac.c glint_shadow.c sx_accel.c glint_dga.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/glint \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/i128/Makefile b/x11/Xserver/hw/xfree86/drivers/i128/Makefile index 4ed2741776bb..8803eef32452 100644 --- a/x11/Xserver/hw/xfree86/drivers/i128/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/i128/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= i128_drv MAN= i128.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i128 SRCS= i128_driver.c i128init.c i128IBMDAC.c i128accel.c i128dga.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i128 \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/i740/Makefile b/x11/Xserver/hw/xfree86/drivers/i740/Makefile index 456a369d9efd..9ae763ea6df1 100644 --- a/x11/Xserver/hw/xfree86/drivers/i740/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/i740/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= i740_drv MAN= i740.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i740 @@ -13,8 +11,6 @@ MAN= i740.4 SRCS= i740_driver.c i740_cursor.c i740_accel.c i740_io.c i740_dga.c \ i740_i2c.c i740_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i740 \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/i810/Makefile b/x11/Xserver/hw/xfree86/drivers/i810/Makefile index 448b6bb2f51c..2bafd979760a 100644 --- a/x11/Xserver/hw/xfree86/drivers/i810/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/i810/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= i810_drv MAN= i810.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810 @@ -15,8 +13,6 @@ SRCS= i810_driver.c i810_cursor.c i810_accel.c i810_memory.c \ i830_memory.c i830_cursor.c i830_accel.c i830_io.c i830_dga.c \ i830_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810 \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/imstt/Makefile b/x11/Xserver/hw/xfree86/drivers/imstt/Makefile index 961a61630781..d3c426bb6245 100644 --- a/x11/Xserver/hw/xfree86/drivers/imstt/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/imstt/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.1 2004/01/02 06:19:22 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= imstt_drv MAN= imstt.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/imstt SRCS= imstt_driver.c imstt_accel.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/imstt \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/mga/Makefile b/x11/Xserver/hw/xfree86/drivers/mga/Makefile index 1a4ac3d9d1b0..ca503925071a 100644 --- a/x11/Xserver/hw/xfree86/drivers/mga/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/mga/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= mga_drv MAN= mga.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga @@ -20,8 +18,6 @@ BUILDSYMLINKS= mga_storm.c mga_storm8.c \ mga_storm.c mga_storm24.c \ mga_storm.c mga_storm32.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga/HALlib \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ diff --git a/x11/Xserver/hw/xfree86/drivers/neomagic/Makefile b/x11/Xserver/hw/xfree86/drivers/neomagic/Makefile index f93307583722..a92e38366936 100644 --- a/x11/Xserver/hw/xfree86/drivers/neomagic/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/neomagic/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= neomagic_drv MAN= neomagic.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/neomagic @@ -13,8 +11,6 @@ MAN= neomagic.4 SRCS= neo_driver.c neo_bank.c neo_cursor.c neo_2097.c neo_2070.c \ neo_2090.c neo_2200.c neo_i2c.c neo_shadow.c neo_dga.c neo_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/neomagic \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/newport/Makefile b/x11/Xserver/hw/xfree86/drivers/newport/Makefile index 679ff188846c..c0ec02eb6dfd 100644 --- a/x11/Xserver/hw/xfree86/drivers/newport/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/newport/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2004/01/08 04:25:34 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= newport_drv MAN= newport.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/newport @@ -13,8 +11,6 @@ MAN= newport.4 SRCS= newport_driver.c newport_regs.c newport_cmap.c newport_shadow.c \ newport_cursor.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/newport \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/nsc/Makefile b/x11/Xserver/hw/xfree86/drivers/nsc/Makefile index e77537035691..141d6528dbe3 100644 --- a/x11/Xserver/hw/xfree86/drivers/nsc/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/nsc/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= nsc_drv MAN= nsc.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc @@ -19,8 +17,6 @@ SRCS= nsc_driver.c nsc_gx1_driver.c nsc_gx1_dga.c nsc_gx1_accel.c \ SRCS+= nsc_msr_asm.S .endif -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/nv/Makefile b/x11/Xserver/hw/xfree86/drivers/nv/Makefile index 2fc5fe43acd7..7bd492f167c1 100644 --- a/x11/Xserver/hw/xfree86/drivers/nv/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/nv/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2004/01/05 03:47:10 soren Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= nv_drv MAN= nv.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv @@ -13,8 +11,6 @@ MAN= nv.4 SRCS= nv_driver.c nv_dac.c nv_setup.c nv_cursor.c nv_xaa.c nv_dga.c \ nv_shadow.c riva_hw.c nv_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/r128/Makefile b/x11/Xserver/hw/xfree86/drivers/r128/Makefile index 0c3eebbc6348..9601f8332bfe 100644 --- a/x11/Xserver/hw/xfree86/drivers/r128/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/r128/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= r128_drv MAN= r128.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati @@ -13,8 +11,6 @@ MAN= r128.4 SRCS= r128_accel.c r128_cursor.c r128_dga.c r128_driver.c r128_video.c \ r128_misc.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/radeon/Makefile b/x11/Xserver/hw/xfree86/drivers/radeon/Makefile index 280e5ec35bba..d0c86c893997 100644 --- a/x11/Xserver/hw/xfree86/drivers/radeon/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/radeon/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2004/01/05 03:48:38 soren Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= radeon_drv MAN= radeon.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati @@ -13,8 +11,6 @@ MAN= radeon.4 SRCS= radeon_accel.c radeon_cursor.c radeon_dga.c radeon_driver.c \ radeon_video.c radeon_misc.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/rendition/Makefile b/x11/Xserver/hw/xfree86/drivers/rendition/Makefile index de406239fa64..30bfc59284db 100644 --- a/x11/Xserver/hw/xfree86/drivers/rendition/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/rendition/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= rendition_drv MAN= rendition.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/rendition @@ -13,8 +11,6 @@ MAN= rendition.4 SRCS= rendition.c vboard.c vmodes.c vramdac.c v1krisc.c \ hwcursor.c vloaduc.c accel.c rendition_shadow.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/rendition \ -I${X11SRCDIR.xc}/programs/Xserver/fb \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/hw/xfree86/drivers/s3/Makefile b/x11/Xserver/hw/xfree86/drivers/s3/Makefile index 35b92bc81109..949299403a05 100644 --- a/x11/Xserver/hw/xfree86/drivers/s3/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/s3/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 14:53:10 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= s3_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3 @@ -13,8 +11,6 @@ SRCS= s3_driver.c s3_IBMRGB.c s3_Trio64DAC.c s3_accel_newmmio.c \ s3_accel_pio.c s3_cursor.c s3_bios.c s3_video.c s3_dga.c \ s3_Ti.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3 \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/s3virge/Makefile b/x11/Xserver/hw/xfree86/drivers/s3virge/Makefile index 289015d73994..03904cec91c5 100644 --- a/x11/Xserver/hw/xfree86/drivers/s3virge/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/s3virge/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= s3virge_drv MAN= s3virge.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3virge @@ -13,8 +11,6 @@ MAN= s3virge.4 SRCS= s3v_driver.c s3v_accel.c s3v_dac.c s3v_hwcurs.c s3v_dga.c \ s3v_i2c.c s3v_shadow.c s3v_xv.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3virge \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/savage/Makefile b/x11/Xserver/hw/xfree86/drivers/savage/Makefile index 8817bc57e0a8..bfd06e35c09e 100644 --- a/x11/Xserver/hw/xfree86/drivers/savage/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/savage/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= savage_drv MAN= savage.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/savage @@ -14,8 +12,6 @@ SRCS= savage_driver.c savage_accel.c savage_cursor.c savage_dga.c \ savage_i2c.c savage_image.c savage_shadow.c savage_vbe.c \ savage_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/savage \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile b/x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile index cc7e1598412f..a546e31e3069 100644 --- a/x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= siliconmotion_drv MAN= siliconmotion.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/siliconmotion @@ -13,8 +11,6 @@ MAN= siliconmotion.4 SRCS= smi_driver.c smi_accel.c smi_dac.c smi_hwcurs.c smi_dga.c \ smi_i2c.c smi_shadow.c smi_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/siliconmotion \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/sis/Makefile b/x11/Xserver/hw/xfree86/drivers/sis/Makefile index 124a6f7aa19d..f8f26dc4e141 100644 --- a/x11/Xserver/hw/xfree86/drivers/sis/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/sis/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= sis_drv MAN= sis.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sis @@ -15,8 +13,6 @@ SRCS= sis_driver.c sis_dac.c sis_cursor.c sis_accel.c sis_setup.c \ sis_opt.c sis_dga.c sis_video.c init.c init301.c sis_shadow.c \ sis6326_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sis \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/tdfx/Makefile b/x11/Xserver/hw/xfree86/drivers/tdfx/Makefile index 7fdb854175fe..ad2f054218d4 100644 --- a/x11/Xserver/hw/xfree86/drivers/tdfx/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/tdfx/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= tdfx_drv MAN= tdfx.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tdfx @@ -13,8 +11,6 @@ MAN= tdfx.4 SRCS= tdfx_driver.c tdfx_io.c tdfx_hwcurs.c tdfx_accel.c tdfx_dga.c \ tdfx_priv.c tdfx_sli.c tdfx_video.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tdfx \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/tga/Makefile b/x11/Xserver/hw/xfree86/drivers/tga/Makefile index 6c699a17ebb3..24dcfc56e838 100644 --- a/x11/Xserver/hw/xfree86/drivers/tga/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/tga/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 14:53:11 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= tga_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tga SRCS= tga_driver.c tga_dac.c tga_accel.c BTramdac.c ICS1562.c \ BT463ramdac.c tga_cursor.c tga_line.c tga_seg.c IBM561ramdac.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tga \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/trident/Makefile b/x11/Xserver/hw/xfree86/drivers/trident/Makefile index c02d0c846fe9..39bc26f94a60 100644 --- a/x11/Xserver/hw/xfree86/drivers/trident/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/trident/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= trident_drv MAN= trident.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/trident @@ -15,8 +13,6 @@ SRCS= trident_driver.c trident_dac.c tridenthelper.c \ image_accel.c blade_accel.c tvga_dac.c trident_dga.c \ trident_shadow.c trident_video.c xp_accel.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/trident \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/tseng/Makefile b/x11/Xserver/hw/xfree86/drivers/tseng/Makefile index ef4f85d3d679..f63504675438 100644 --- a/x11/Xserver/hw/xfree86/drivers/tseng/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/tseng/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= tseng_drv MAN= tseng.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tseng @@ -14,8 +12,6 @@ SRCS= tseng_driver.c tseng_ramdac.c tseng_bank.c tseng_clock.c \ tseng_accel.c tseng_acl.c tseng_colexp.c tseng_cursor.c \ tseng_dpms.c tseng_dga.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tseng \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/drivers/vesa/Makefile b/x11/Xserver/hw/xfree86/drivers/vesa/Makefile index c39497f828d3..f1ed31ef2388 100644 --- a/x11/Xserver/hw/xfree86/drivers/vesa/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/vesa/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= vesa_drv MAN= vesa.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vesa SRCS= vesa.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vesa \ -I${X11SRCDIR.xc}/programs/Xserver/fb \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \ diff --git a/x11/Xserver/hw/xfree86/drivers/vga/Makefile b/x11/Xserver/hw/xfree86/drivers/vga/Makefile index 54f104e3725d..34df454da028 100644 --- a/x11/Xserver/hw/xfree86/drivers/vga/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/vga/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= vga_drv MAN= vga.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vga SRCS= generic.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vga \ -I${X11SRCDIR.xc}/programs/Xserver/fb \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \ diff --git a/x11/Xserver/hw/xfree86/drivers/vmware/Makefile b/x11/Xserver/hw/xfree86/drivers/vmware/Makefile index 3c2f3f86224c..9989ff59d56c 100644 --- a/x11/Xserver/hw/xfree86/drivers/vmware/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/vmware/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:17:35 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers .include "../../../../Makefile.serverlib" -.include - MODULE= vmware_drv MAN= vmware.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vmware SRCS= vmware.c vmwarecurs.c vmwarexaa.c bits2pixels.c offscreen_manager.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vmware \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/dummy/Makefile b/x11/Xserver/hw/xfree86/dummy/Makefile index f3e24896e370..d74297fbd707 100644 --- a/x11/Xserver/hw/xfree86/dummy/Makefile +++ b/x11/Xserver/hw/xfree86/dummy/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 04:53:24 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= dummy .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib @@ -14,8 +12,6 @@ SRCS= fatalerror.c getvalidbios.c pcitestmulti.c sigiostubs.c \ xf86msg.c xf86msgverb.c xf86opt.c xf86screens.c \ xf86servisinit.c xf86verbose.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/i2c/Makefile b/x11/Xserver/hw/xfree86/i2c/Makefile index b0e5fdab1b78..5b6551983a02 100644 --- a/x11/Xserver/hw/xfree86/i2c/Makefile +++ b/x11/Xserver/hw/xfree86/i2c/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= i2c .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= xf86i2c.c xf86i2cmodule.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \ diff --git a/x11/Xserver/hw/xfree86/input/calcomp/Makefile b/x11/Xserver/hw/xfree86/input/calcomp/Makefile index df8cfeac4b51..098e87902e41 100644 --- a/x11/Xserver/hw/xfree86/input/calcomp/Makefile +++ b/x11/Xserver/hw/xfree86/input/calcomp/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/27 03:14:56 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= calcomp_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/calcomp SRCS= xf86Calcomp.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/calcomp \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/citron/Makefile b/x11/Xserver/hw/xfree86/input/citron/Makefile index df5f7ccd88d9..7b26248c16b1 100644 --- a/x11/Xserver/hw/xfree86/input/citron/Makefile +++ b/x11/Xserver/hw/xfree86/input/citron/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= citron_drv MAN= citron.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/citron SRCS= citron.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/citron \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/digitaledge/Makefile b/x11/Xserver/hw/xfree86/input/digitaledge/Makefile index 3b110b2982c3..fc597cfdfd45 100644 --- a/x11/Xserver/hw/xfree86/input/digitaledge/Makefile +++ b/x11/Xserver/hw/xfree86/input/digitaledge/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/27 03:14:56 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= digitaledge_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/digitaledge SRCS= DigitalEdge.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/digitaledge \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/dmc/Makefile b/x11/Xserver/hw/xfree86/input/dmc/Makefile index 8a34533408ca..ff7f5e6055ed 100644 --- a/x11/Xserver/hw/xfree86/input/dmc/Makefile +++ b/x11/Xserver/hw/xfree86/input/dmc/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= dmc_drv MAN= dmc.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dmc SRCS= xf86DMC.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dmc \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/dynapro/Makefile b/x11/Xserver/hw/xfree86/input/dynapro/Makefile index a1c9007ff6e2..ce707d428484 100644 --- a/x11/Xserver/hw/xfree86/input/dynapro/Makefile +++ b/x11/Xserver/hw/xfree86/input/dynapro/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= dynapro_drv MAN= dynapro.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dynapro SRCS= xf86Dyna.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dynapro \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/elographics/Makefile b/x11/Xserver/hw/xfree86/input/elographics/Makefile index ada7cd50664e..5addaad51d4c 100644 --- a/x11/Xserver/hw/xfree86/input/elographics/Makefile +++ b/x11/Xserver/hw/xfree86/input/elographics/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= elographics_drv MAN= elographics.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/elographics SRCS= xf86Elo.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/elographics \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/fpit/Makefile b/x11/Xserver/hw/xfree86/input/fpit/Makefile index 25e94b5b169b..1b3819da35bb 100644 --- a/x11/Xserver/hw/xfree86/input/fpit/Makefile +++ b/x11/Xserver/hw/xfree86/input/fpit/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= fpit_drv MAN= fpit.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/fpit SRCS= xf86Fpit.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/fpit \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/hyperpen/Makefile b/x11/Xserver/hw/xfree86/input/hyperpen/Makefile index 672c3ed2b4aa..90e02ca6931f 100644 --- a/x11/Xserver/hw/xfree86/input/hyperpen/Makefile +++ b/x11/Xserver/hw/xfree86/input/hyperpen/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/27 03:14:56 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= hyperpen_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/hyperpen SRCS= xf86HyperPen.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/hyperpen \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/js_x/Makefile b/x11/Xserver/hw/xfree86/input/js_x/Makefile index 48c200fd7f36..db9d4e3a89cb 100644 --- a/x11/Xserver/hw/xfree86/input/js_x/Makefile +++ b/x11/Xserver/hw/xfree86/input/js_x/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= js_x_drv MAN= js_x.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/jamstudio SRCS= js_x.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/jamstudio \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/kbd/Makefile b/x11/Xserver/hw/xfree86/input/kbd/Makefile index 158098eb3a74..c19ff74e86dd 100644 --- a/x11/Xserver/hw/xfree86/input/kbd/Makefile +++ b/x11/Xserver/hw/xfree86/input/kbd/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.3 2004/01/05 10:16:18 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= kbd_drv MAN= kbd.4 keyboard.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/keyboard SRCS= kbd.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/keyboard \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/magellan/Makefile b/x11/Xserver/hw/xfree86/input/magellan/Makefile index cc5a1eb28098..000e99703b63 100644 --- a/x11/Xserver/hw/xfree86/input/magellan/Makefile +++ b/x11/Xserver/hw/xfree86/input/magellan/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/27 03:14:56 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= magellan_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/magellan SRCS= magellan.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/magellan \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/microtouch/Makefile b/x11/Xserver/hw/xfree86/input/microtouch/Makefile index 4cf13a98240b..fa1f1c367e4c 100644 --- a/x11/Xserver/hw/xfree86/input/microtouch/Makefile +++ b/x11/Xserver/hw/xfree86/input/microtouch/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= microtouch_drv MAN= microtouch.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/microtouch SRCS= microtouch.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/microtouch \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/mouse/Makefile b/x11/Xserver/hw/xfree86/input/mouse/Makefile index 92b16535d4bc..fb56aef3ab01 100644 --- a/x11/Xserver/hw/xfree86/input/mouse/Makefile +++ b/x11/Xserver/hw/xfree86/input/mouse/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= mouse_drv MAN= mouse.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse SRCS= mouse.c pnp.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/mutouch/Makefile b/x11/Xserver/hw/xfree86/input/mutouch/Makefile index a5faa5793cb9..65bcdd01892a 100644 --- a/x11/Xserver/hw/xfree86/input/mutouch/Makefile +++ b/x11/Xserver/hw/xfree86/input/mutouch/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= mutouch_drv MAN= mutouch.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mutouch SRCS= xf86MuTouch.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mutouch \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/palmax/Makefile b/x11/Xserver/hw/xfree86/input/palmax/Makefile index b53d2bf26540..cb92c7228b4b 100644 --- a/x11/Xserver/hw/xfree86/input/palmax/Makefile +++ b/x11/Xserver/hw/xfree86/input/palmax/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= palmax_drv MAN= palmax.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/palmax SRCS= xf86Palmax.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/palmax \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/penmount/Makefile b/x11/Xserver/hw/xfree86/input/penmount/Makefile index 95ba914543ff..dc13e2978ed7 100644 --- a/x11/Xserver/hw/xfree86/input/penmount/Makefile +++ b/x11/Xserver/hw/xfree86/input/penmount/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= penmount_drv MAN= penmount.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/penmount SRCS= xf86PM.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/penmount \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/spaceorb/Makefile b/x11/Xserver/hw/xfree86/input/spaceorb/Makefile index c3754700fc6c..8c12925de598 100644 --- a/x11/Xserver/hw/xfree86/input/spaceorb/Makefile +++ b/x11/Xserver/hw/xfree86/input/spaceorb/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/27 03:14:56 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= spaceorb_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/spaceorb SRCS= spaceorb.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/spaceorb \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/summa/Makefile b/x11/Xserver/hw/xfree86/input/summa/Makefile index 6df1ba5ee829..34a8c0239980 100644 --- a/x11/Xserver/hw/xfree86/input/summa/Makefile +++ b/x11/Xserver/hw/xfree86/input/summa/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/27 03:14:56 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= summa_drv .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/summa SRCS= xf86Summa.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/summa \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/tek4957/Makefile b/x11/Xserver/hw/xfree86/input/tek4957/Makefile index 483cf417f878..c2231c2ce495 100644 --- a/x11/Xserver/hw/xfree86/input/tek4957/Makefile +++ b/x11/Xserver/hw/xfree86/input/tek4957/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= tek4957_drv MAN= tek4957.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/tek4957 SRCS= xf86Tek4957.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/tek4957 \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/void/Makefile b/x11/Xserver/hw/xfree86/input/void/Makefile index 2b4cea0c1a1d..9c6086ee48aa 100644 --- a/x11/Xserver/hw/xfree86/input/void/Makefile +++ b/x11/Xserver/hw/xfree86/input/void/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= void_drv MAN= void.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/void SRCS= void.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/void \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/input/wacom/Makefile b/x11/Xserver/hw/xfree86/input/wacom/Makefile index 0da1df3f9f74..0e63ef523ab0 100644 --- a/x11/Xserver/hw/xfree86/input/wacom/Makefile +++ b/x11/Xserver/hw/xfree86/input/wacom/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2004/01/02 06:20:26 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/input .include "../../../../Makefile.serverlib" -.include - MODULE= wacom_drv MAN= wacom.4 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/wacom SRCS= xf86Wacom.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/wacom \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ diff --git a/x11/Xserver/hw/xfree86/int10/Makefile b/x11/Xserver/hw/xfree86/int10/Makefile index f1cc3749402d..abc3d61058f3 100644 --- a/x11/Xserver/hw/xfree86/int10/Makefile +++ b/x11/Xserver/hw/xfree86/int10/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= int10 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} @@ -17,8 +15,6 @@ SRCS= pci.c xf86int10module.c helper_exec.c helper_mem.c xf86int10.c \ CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \ -D_X86EMU -D_PC -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ diff --git a/x11/Xserver/hw/xfree86/loader/Makefile b/x11/Xserver/hw/xfree86/loader/Makefile index 1ed0d53d86ff..9d0252a6e6cb 100644 --- a/x11/Xserver/hw/xfree86/loader/Makefile +++ b/x11/Xserver/hw/xfree86/loader/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2003/12/22 15:45:57 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= loader .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} @@ -11,8 +9,6 @@ SRCS= aoutloader.c coffloader.c dlloader.c elfloader.c hash.c loader.c \ loadmod.c loadfont.c loadext.c os.c dixsym.c misym.c xf86sym.c \ fontsym.c extsym.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/pcidata/Makefile b/x11/Xserver/hw/xfree86/pcidata/Makefile index 935c9cb91efd..bae94cc4c853 100644 --- a/x11/Xserver/hw/xfree86/pcidata/Makefile +++ b/x11/Xserver/hw/xfree86/pcidata/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= pcidata .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci SRCS= xf86PciData.c xf86PciIds.h -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus \ diff --git a/x11/Xserver/hw/xfree86/rac/Makefile b/x11/Xserver/hw/xfree86/rac/Makefile index 82337a508bec..f8fe62f4bac4 100644 --- a/x11/Xserver/hw/xfree86/rac/Makefile +++ b/x11/Xserver/hw/xfree86/rac/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 10:14:18 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= rac .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= xf86RAC.c xf86RACmodule.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/ramdac/Makefile b/x11/Xserver/hw/xfree86/ramdac/Makefile index 37067e1d3339..e74eb404a8d0 100644 --- a/x11/Xserver/hw/xfree86/ramdac/Makefile +++ b/x11/Xserver/hw/xfree86/ramdac/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - 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 xf86RamDacMod.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/scanpci/Makefile b/x11/Xserver/hw/xfree86/scanpci/Makefile index 9cc8de0a284c..5bbe40ff22bb 100644 --- a/x11/Xserver/hw/xfree86/scanpci/Makefile +++ b/x11/Xserver/hw/xfree86/scanpci/Makefile @@ -1,17 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 04:53:24 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= scanpci .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci SRCS= xf86ScanPci.c xf86PciIds.h -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} SCANPCIOBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/scanpci && ${PRINTOBJDIR} #CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \ diff --git a/x11/Xserver/hw/xfree86/shadowfb/Makefile b/x11/Xserver/hw/xfree86/shadowfb/Makefile index eaa481ac2170..80ce385da8e3 100644 --- a/x11/Xserver/hw/xfree86/shadowfb/Makefile +++ b/x11/Xserver/hw/xfree86/shadowfb/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 10:14:18 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= shadowfb .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= sfbmodule.c shadow.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ -I${X11SRCDIR.xc}/programs/Xserver/include \ diff --git a/x11/Xserver/hw/xfree86/vbe/Makefile b/x11/Xserver/hw/xfree86/vbe/Makefile index 34c034b7dda0..0d5ec8d10ccf 100644 --- a/x11/Xserver/hw/xfree86/vbe/Makefile +++ b/x11/Xserver/hw/xfree86/vbe/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:20 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= vbe .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= vbe.c vbeModes.c vbe_module.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/hw/xfree86/vgahw/Makefile b/x11/Xserver/hw/xfree86/vgahw/Makefile index cf17911d6204..f768c32e48e4 100644 --- a/x11/Xserver/hw/xfree86/vgahw/Makefile +++ b/x11/Xserver/hw/xfree86/vgahw/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:21 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= vgahw .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= vgaHW.c vgaHWmodule.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xfree86/xaa/Makefile b/x11/Xserver/hw/xfree86/xaa/Makefile index 4099ecb344ab..3ded60e9c7b8 100644 --- a/x11/Xserver/hw/xfree86/xaa/Makefile +++ b/x11/Xserver/hw/xfree86/xaa/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2003/12/23 14:28:21 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= xaa .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} @@ -23,8 +21,6 @@ SRCS= lsb_fixed_xaaBitmap.c lsb_fixed_xaaBitmap3.c lsb_fixed_xaaStipple.c \ xaaSeg.c xaaSpans.c xaaStateChange.c xaaTEText.c xaaTables.c \ xaaWideLine.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${X11SRCDIR.xc} \ diff --git a/x11/Xserver/hw/xfree86/xf1bpp/Makefile b/x11/Xserver/hw/xfree86/xf1bpp/Makefile index aedda8bb0092..983e98a0f57a 100644 --- a/x11/Xserver/hw/xfree86/xf1bpp/Makefile +++ b/x11/Xserver/hw/xfree86/xf1bpp/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/08 04:20:27 lukem Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= xf1bpp .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= maskbits.c mfbbitblt.c mfbbltC.c mfbbltCI.c mfbbltG.c mfbbltO.c \ @@ -18,8 +16,6 @@ SRCS= maskbits.c mfbbitblt.c mfbbltC.c mfbbltCI.c mfbbltG.c mfbbltO.c \ mfbscrinit.c mfbseg.c mfbsetsp.c mfbteblack.c mfbtewhite.c mfbtileC.c \ mfbtileG.c mfbwindow.c mfbzerarc.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc} \ -I${X11SRCDIR.xc}/include/fonts \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ diff --git a/x11/Xserver/hw/xfree86/xf24_32bpp/Makefile b/x11/Xserver/hw/xfree86/xf24_32bpp/Makefile index c0b79275499e..4c30df65bbad 100644 --- a/x11/Xserver/hw/xfree86/xf24_32bpp/Makefile +++ b/x11/Xserver/hw/xfree86/xf24_32bpp/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 10:14:18 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= xf24_32bpp .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= cfb24_32module.c cfbcpyarea.c cfbgc24.c cfbgc32.c cfbgcmisc.c \ cfbimage.c cfbpixmap.c cfbscrinit.c cfbwindow.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ diff --git a/x11/Xserver/hw/xfree86/xf4bpp/Makefile b/x11/Xserver/hw/xfree86/xf4bpp/Makefile index 0a7a916f324b..8dfef3758ee3 100644 --- a/x11/Xserver/hw/xfree86/xf4bpp/Makefile +++ b/x11/Xserver/hw/xfree86/xf4bpp/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 10:14:18 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= xf4bpp .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} @@ -18,8 +16,6 @@ SRCS= emulOpStip.c emulRepAre.c emulTile.c mfbbres.c mfbbresd.c \ ppcWindow.c vgaBitBlt.c vgaGC.c vgaImages.c vgaSolid.c vgaStipple.c \ vgamodule.c wm3.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ diff --git a/x11/Xserver/hw/xfree86/xf86/Makefile b/x11/Xserver/hw/xfree86/xf86/Makefile index 8199954967e1..824411997caf 100644 --- a/x11/Xserver/hw/xfree86/xf86/Makefile +++ b/x11/Xserver/hw/xfree86/xf86/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2004/01/26 05:14:13 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $ .include "../../../Makefile.serverlib" -.include .include # for HOST_SH LIB= xf86 @@ -17,13 +16,12 @@ SRCS= xf86Configure.c xf86Bus.c xf86isaBus.c xf86pciBus.c xf86fbBus.c \ xf86xv.c xf86xvmc.c xf86cmap.c xf86PM.c xf86Debug.c xf86KbdBSD.c \ xf86Xinput.c xisb.c xf86XKB.c xf86RandR.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} +CLEANFILES+= xf86Build.h +xf86Build.h: .PHONY + ${_MKTARGET_CREATE} + echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET} -.PHONY: xf86includes -includes: xf86includes - -xf86includes: - echo "#define BUILD_DATE `date +%Y%m%d`" > ${XSERVERINCDIR}/xf86Build.h +xf86Init.o: xf86Build.h CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ @@ -50,6 +48,7 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \ -I${X11SRCDIR.xc}/programs/Xserver/render \ -I${X11SRCDIR.xc}/programs/Xserver/randr \ + -I. \ -I${XSERVERINCDIR} CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \ diff --git a/x11/Xserver/hw/xfree86/xf86_os/Makefile b/x11/Xserver/hw/xfree86/xf86_os/Makefile index d3a829e76bec..55cff6da1c59 100644 --- a/x11/Xserver/hw/xfree86/xf86_os/Makefile +++ b/x11/Xserver/hw/xfree86/xf86_os/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2004/01/24 05:51:20 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:07 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= xf86_os .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support @@ -71,8 +69,6 @@ BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \ SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc} -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd \ diff --git a/x11/Xserver/hw/xfree86/xf8_16bpp/Makefile b/x11/Xserver/hw/xfree86/xf8_16bpp/Makefile index 60d84fc2785d..3fb6be66df3b 100644 --- a/x11/Xserver/hw/xfree86/xf8_16bpp/Makefile +++ b/x11/Xserver/hw/xfree86/xf8_16bpp/Makefile @@ -1,18 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 10:14:18 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= xf8_16bpp .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} SRCS= cfb8_16module.c cfbscrinit.c cfbwindow.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ diff --git a/x11/Xserver/hw/xfree86/xf8_32bpp/Makefile b/x11/Xserver/hw/xfree86/xf8_32bpp/Makefile index 6cd71603c84d..703e33a91883 100644 --- a/x11/Xserver/hw/xfree86/xf8_32bpp/Makefile +++ b/x11/Xserver/hw/xfree86/xf8_32bpp/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2004/01/05 10:14:18 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../../Makefile.serverlib" -.include - LIB= xf8_32bpp .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} @@ -13,8 +11,6 @@ SRCS= cfb8_32module.c cfbbstore.c cfbcpyarea.c cfbcpyplane.c cfbgc32.c \ cfbgc8.c cfbgcmisc.c cfbgcunder.c cfbimage.c cfbpntwin.c \ cfbscrinit.c cfbwindow.c xf86overlay.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \ -I${X11SRCDIR.xc}/programs/Xserver/mfb \ diff --git a/x11/Xserver/hw/xfree86/xloader/Makefile b/x11/Xserver/hw/xfree86/xloader/Makefile index 0e2b1637e5ed..0f8844f50cb2 100644 --- a/x11/Xserver/hw/xfree86/xloader/Makefile +++ b/x11/Xserver/hw/xfree86/xloader/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2003/12/26 04:53:24 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ .include "../../../Makefile.serverlib" -.include - LIB= xloader .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader SRCS= aoutloader.c coffloader.c dlloader.c elfloader.c hash.c loader.c \ loadmod.c loadfont.c loadext.c os.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \ diff --git a/x11/Xserver/hw/xnest/Makefile b/x11/Xserver/hw/xnest/Makefile index e08bb624abe6..dbdc9f84b969 100644 --- a/x11/Xserver/hw/xnest/Makefile +++ b/x11/Xserver/hw/xnest/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:07 lukem Exp $ .include "../../Makefile.serverlib" -.include - LIB= xnest .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xnest .PATH: ${X11SRCDIR.xc}/programs/Xserver/Xi @@ -14,8 +12,6 @@ SRCS= Args.c Color.c Cursor.c Display.c Events.c Font.c \ Pixmap.c Pointer.c Screen.c TestExt.c Visual.c \ Window.c miinitext.c stubs.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xnest \ -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xc}/include/fonts \ diff --git a/x11/Xserver/mfb/Makefile.mfb b/x11/Xserver/mfb/Makefile.mfb index 7725924ae081..9432f6bdf544 100644 --- a/x11/Xserver/mfb/Makefile.mfb +++ b/x11/Xserver/mfb/Makefile.mfb @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.mfb,v 1.1 2003/12/21 03:07:01 rtr Exp $ - -.include +# $NetBSD: Makefile.mfb,v 1.2 2004/02/07 06:52:07 lukem Exp $ LIB= mfb .PATH: ${X11SRCDIR.xc}/programs/Xserver/mfb @@ -40,8 +38,6 @@ BUILDSYMLINKS= mfbline.c mfbseg.c \ mfbtile.c mfbtileC.c \ mfbtile.c mfbtileG.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/mfb \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ -I${X11SRCDIR.xc}/programs/Xserver/include \ diff --git a/x11/Xserver/miext/layer/Makefile b/x11/Xserver/miext/layer/Makefile index 9994f699f336..ad7dedaf59d1 100644 --- a/x11/Xserver/miext/layer/Makefile +++ b/x11/Xserver/miext/layer/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/22 16:18:19 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../Makefile.serverlib" -.include - LIB= layer .PATH: ${X11SRCDIR.xc}/programs/Xserver/miext/${LIB} @@ -15,8 +13,6 @@ SRCS= layergc.c layerinit.c layerpict.c layerwin.c SRCS+= laymodule.c .endif -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/miext/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/miext/shadow/Makefile b/x11/Xserver/miext/shadow/Makefile index 5604decc27aa..370b51a43808 100644 --- a/x11/Xserver/miext/shadow/Makefile +++ b/x11/Xserver/miext/shadow/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/12/22 16:18:19 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:08 lukem Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules .include "../../Makefile.serverlib" -.include - LIB= shadow .PATH: ${X11SRCDIR.xc}/programs/Xserver/miext/${LIB} @@ -18,8 +16,6 @@ SRCS= shadow.c shalloc.c shplanar.c shplanar8.c shpacked.c shrotate.c \ SRCS+= shmodule.c .endif -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/miext/${LIB} \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ -I${X11SRCDIR.xc}/programs/Xserver/fb \ diff --git a/x11/Xserver/os/Makefile b/x11/Xserver/os/Makefile index 40ccfb3467f5..53c69bce0827 100644 --- a/x11/Xserver/os/Makefile +++ b/x11/Xserver/os/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2004/01/10 16:28:29 rtr Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/07 06:52:08 lukem Exp $ .include "../Makefile.serverlib" -.include - LIB= os .PATH: ${X11SRCDIR.xc}/programs/Xserver/os .PATH: ${X11SRCDIR.xc}/lib/xtrans @@ -13,8 +11,6 @@ SRCS= WaitFor.c access.c connection.c io.c oscolor.c osinit.c \ decompress.c transport.c lbxio.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${DESTDIR}${X11INCDIR}/X11 \ diff --git a/x11/Xserver/randr/Makefile b/x11/Xserver/randr/Makefile index 24f32f2e35e2..a86dd836d34a 100644 --- a/x11/Xserver/randr/Makefile +++ b/x11/Xserver/randr/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2003/09/30 06:41:30 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:08 lukem Exp $ .include "../Makefile.serverlib" -.include - LIB= randr .PATH: ${X11SRCDIR.xc}/programs/Xserver/randr SRCS= randr.c mirandr.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${X11SRCDIR.xc}/programs/Xserver/mi \ diff --git a/x11/Xserver/record/Makefile.record b/x11/Xserver/record/Makefile.record index 3551d763c8cb..0b5e27de195a 100644 --- a/x11/Xserver/record/Makefile.record +++ b/x11/Xserver/record/Makefile.record @@ -1,14 +1,10 @@ -# $NetBSD: Makefile.record,v 1.2 2003/09/30 06:41:30 lukem Exp $ - -.include +# $NetBSD: Makefile.record,v 1.3 2004/02/07 06:52:08 lukem Exp $ LIB= record .PATH: ${X11SRCDIR.xc}/programs/Xserver/${LIB} SRCS+= record.c set.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${DESTDIR}${X11INCDIR}/X11 \ diff --git a/x11/Xserver/render/Makefile b/x11/Xserver/render/Makefile index 284d2caebb79..88ed3f05934b 100644 --- a/x11/Xserver/render/Makefile +++ b/x11/Xserver/render/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.4 2003/09/30 09:49:29 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:08 lukem Exp $ .include "../Makefile.serverlib" -.include - LIB= render .PATH: ${X11SRCDIR.xc}/programs/Xserver/render SRCS= animcur.c filter.c glyph.c miglyph.c miindex.c \ mipict.c mirect.c mitrap.c mitri.c picture.c render.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/render \ -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ diff --git a/x11/Xserver/xkb/Makefile b/x11/Xserver/xkb/Makefile index 6a9cf34f637d..6869f20b968e 100644 --- a/x11/Xserver/xkb/Makefile +++ b/x11/Xserver/xkb/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2003/12/22 14:07:08 rtr Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/07 06:52:08 lukem Exp $ .include "../Makefile.serverlib" -.include - LIB= xkb .PATH: ${X11SRCDIR.xc}/programs/Xserver/xkb .PATH: ${X11SRCDIR.xc}/lib/X11 @@ -19,8 +17,6 @@ SRCS= XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c ddxBeep.c \ BUILDSYMLINKS+= xkbmisc.c xkbfmisc.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${DESTDIR}${X11INCDIR}/X11 \ diff --git a/x11/Xserver/xtrap/Makefile.xtrap b/x11/Xserver/xtrap/Makefile.xtrap index 0f1542fe57da..23eb6eb02628 100644 --- a/x11/Xserver/xtrap/Makefile.xtrap +++ b/x11/Xserver/xtrap/Makefile.xtrap @@ -1,14 +1,10 @@ -# $NetBSD: Makefile.xtrap,v 1.2 2003/09/30 06:41:30 lukem Exp $ - -.include +# $NetBSD: Makefile.xtrap,v 1.3 2004/02/07 06:52:08 lukem Exp $ LIB= xtrap .PATH: ${X11SRCDIR.xc}/programs/Xserver/XTrap SRCS+= xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c -XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR} - CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \ -I${XSERVERINCDIR} \ -I${DESTDIR}${X11INCDIR}/X11/extensions \