head 1.2; access; symbols netbsd-5-2-3-RELEASE:1.2 netbsd-5-1-5-RELEASE:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base:1.2 netbsd-5-2-2-RELEASE:1.2 netbsd-5-1-4-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.2 netbsd-5-1-3-RELEASE:1.2 netbsd-5-2:1.2.0.8 netbsd-5-2-RELEASE:1.2 netbsd-5-2-RC1:1.2 netbsd-5-1-2-RELEASE:1.2 netbsd-5-1-1-RELEASE:1.2 netbsd-5-1:1.2.0.6 netbsd-5-1-RELEASE:1.2 netbsd-5-1-RC4:1.2 netbsd-5-1-RC3:1.2 netbsd-5-1-RC2:1.2 netbsd-5-1-RC1:1.2 netbsd-5-0-2-RELEASE:1.2 netbsd-5-0-1-RELEASE:1.2 netbsd-5-0:1.2.0.4 netbsd-5-0-RELEASE:1.2 netbsd-5-0-RC4:1.2 netbsd-5-0-RC3:1.2 netbsd-5-0-RC2:1.2 netbsd-5-0-RC1:1.2 netbsd-5:1.2.0.2 netbsd-5-base:1.2 netbsd-3-1-1-RELEASE:1.1.1.4.6.1 netbsd-3-1:1.1.1.4.6.1.0.2 netbsd-3-1-RELEASE:1.1.1.4.6.1 netbsd-3-1-RC4:1.1.1.4.6.1 netbsd-3-1-RC3:1.1.1.4.6.1 netbsd-3-1-RC2:1.1.1.4.6.1 netbsd-3-1-RC1:1.1.1.4.6.1 netbsd-3-0-RC4:1.1.1.4.6.1 netbsd-2-0-3-RELEASE:1.1.1.4 netbsd-2-1:1.1.1.4.0.8 netbsd-2-1-RELEASE:1.1.1.4 netbsd-2-1-RC6:1.1.1.4 netbsd-2-1-RC5:1.1.1.4 netbsd-2-1-RC4:1.1.1.4 netbsd-2-1-RC3:1.1.1.4 netbsd-2-1-RC2:1.1.1.4 netbsd-2-1-RC1:1.1.1.4 netbsd-2-0-2-RELEASE:1.1.1.4 v4-5-0_beforeimport:1.1.1.4 netbsd-3:1.1.1.4.0.6 netbsd-3-base:1.1.1.4 netbsd-2-0-1-RELEASE:1.1.1.4 netbsd-2:1.1.1.4.0.4 netbsd-2-base:1.1.1.4 netbsd-2-0-RELEASE:1.1.1.4 netbsd-2-0-RC5:1.1.1.4 netbsd-2-0-RC4:1.1.1.4 netbsd-2-0-RC3:1.1.1.4 netbsd-2-0-RC2:1.1.1.4 netbsd-2-0-RC1:1.1.1.4 netbsd-2-0:1.1.1.4.0.2 netbsd-2-0-base:1.1.1.4 v4-4-0:1.1.1.4 v4-4-0_beforeimport:1.1.1.3 netbsd-1-6-PATCH002-RELEASE:1.1.1.2 netbsd-1-6-PATCH002:1.1.1.2 netbsd-1-6-PATCH002-RC4:1.1.1.2 v4-3-0-2003-12-19:1.1.1.3 netbsd-1-6-PATCH002-RC3:1.1.1.2 netbsd-1-6-PATCH002-RC2:1.1.1.2 netbsd-1-6-PATCH002-RC1:1.1.1.2 netbsd-1-6:1.1.1.2.0.2 netbsd-1-6-base:1.1.1.2 v4-3-0:1.1.1.2 v4-3-0_beforeimport:1.1.1.1 netbsd-1-6-PATCH001:1.1.1.1 netbsd-1-6-RELEASE:1.1.1.1 v4-2-1:1.1.1.1 v4-2-1_beforeimport:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 v4-2-0:1.1.1.1 XF86:1.1.1; locks; strict; comment @# @; 1.2 date 2005.03.18.14.55.02; author tron; state dead; branches; next 1.1; 1.1 date 2002.01.19.14.54.26; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.01.19.14.54.26; author tron; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2003.02.28.13.18.43; author tron; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2003.12.19.12.48.55; author tron; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2004.03.05.14.23.59; author tron; state Exp; branches 1.1.1.4.6.1; next ; 1.1.1.4.6.1 date 2005.04.06.20.00.14; author tron; state dead; branches; next ; desc @@ 1.2 log @Resolve conflicts from import of XFree86 4.5.0. @ text @XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.1 2001/10/04 18:28:21 alanh Exp $ #include #if GlxUseBuiltInDRIDriver #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx #define DoDebugLib DebugLibGlx #define DoProfileLib ProfileLibGlx #else #define DoNormalLib SharedLibGlxWithoutPIC #define DoSharedLib !SharedLibGlxWithoutPIC #define DoExtrasLib NO #define DoDebugLib NO #define DoProfileLib NO #endif #include "../common/Imakefile.inc" #include "Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" #endif DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) DRIOBJS = $(GLXLIBSRC)/mesa/dri/dri_mesa.o \ $(GLXLIBSRC)/dri/dri_tmm.o DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ $(GLXLIBSRC)/dri/drm/xf86drmSL.o #ifdef GlxSoProf LOSRCS = ../../../../lowpc.c HISRCS = ../../../../highpc.c LOOBJS = ../../../../lowpc.o HIOBJS = ../../../../highpc.o #endif SRCS = $(I830SRCS) OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS) REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) #include LibraryObjectRule() SubdirLibraryRule($(I830OBJS)) NormalLintTarget($(SRCS)) #if !GlxUseBuiltInDRIDriver LIBNAME = i830_dri.so SharedDriModuleTarget($(LIBNAME),DONE,$(OBJS)) InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) #ifdef GlxSoProf SOPROF_LIBNAME = _i830_dri_p NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE,$(ALL_OBJS)) InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) #endif #endif DependTarget() @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import of XFree86 4.2.0. @ text @@ 1.1.1.2 log @Import of XFree86 4.3.0. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.7 2002/11/25 14:04:51 eich Exp $ a20 6 #include "../../array_cache/Imakefile.inc" #include "../../math/Imakefile.inc" #include "../../swrast/Imakefile.inc" #include "../../swrast_setup/Imakefile.inc" #include "../../tnl/Imakefile.inc" #include "../../tnl_dd/Imakefile.inc" d22 1 a22 1 #if defined(i386Architecture) && MesaUseX86Asm a26 1 d29 2 a30 1 DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o d60 1 a60 1 SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) d65 1 a65 1 NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) @ 1.1.1.3 log @Import of 2003-12-19 sources from XFree86's 4.3 branch. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.7.2.1 2003/05/24 22:22:04 sven Exp $ a77 12 InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_3d_reg.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_context.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_debug.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_ioctl.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_screen.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_span.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_state.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_tex.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_tris.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) InstallDriverSDKNonExecFile(i830_vb.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830) @ 1.1.1.4 log @Import of XFree86 4.4.0. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.7 2002/11/25 14:04:51 eich Exp $ d78 12 @ 1.1.1.4.6.1 log @Apply patch (requested by jmc in ticket #114): Update XFree86 to version 4.5.0. @ text @@