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.1.8.1
	netbsd-3-1:1.1.1.1.8.1.0.2
	netbsd-3-1-RELEASE:1.1.1.1.8.1
	netbsd-3-1-RC4:1.1.1.1.8.1
	netbsd-3-1-RC3:1.1.1.1.8.1
	netbsd-3-1-RC2:1.1.1.1.8.1
	netbsd-3-1-RC1:1.1.1.1.8.1
	netbsd-3-0-RC4:1.1.1.1.8.1
	netbsd-2-0-3-RELEASE:1.1.1.1
	netbsd-2-1:1.1.1.1.0.10
	netbsd-2-1-RELEASE:1.1.1.1
	netbsd-2-1-RC6:1.1.1.1
	netbsd-2-1-RC5:1.1.1.1
	netbsd-2-1-RC4:1.1.1.1
	netbsd-2-1-RC3:1.1.1.1
	netbsd-2-1-RC2:1.1.1.1
	netbsd-2-1-RC1:1.1.1.1
	netbsd-2-0-2-RELEASE:1.1.1.1
	v4-5-0_beforeimport:1.1.1.1
	netbsd-3:1.1.1.1.0.8
	netbsd-3-base:1.1.1.1
	netbsd-2-0-1-RELEASE:1.1.1.1
	netbsd-2:1.1.1.1.0.6
	netbsd-2-base:1.1.1.1
	netbsd-2-0-RELEASE:1.1.1.1
	netbsd-2-0-RC5:1.1.1.1
	netbsd-2-0-RC4:1.1.1.1
	netbsd-2-0-RC3:1.1.1.1
	netbsd-2-0-RC2:1.1.1.1
	netbsd-2-0-RC1:1.1.1.1
	netbsd-2-0:1.1.1.1.0.4
	netbsd-2-0-base:1.1.1.1
	v4-4-0:1.1.1.1
	v4-4-0_beforeimport:1.1.1.1
	netbsd-1-6-PATCH002-RELEASE:1.1.1.1
	netbsd-1-6-PATCH002:1.1.1.1
	netbsd-1-6-PATCH002-RC4:1.1.1.1
	v4-3-0-2003-12-19:1.1.1.1
	netbsd-1-6-PATCH002-RC3:1.1.1.1
	netbsd-1-6-PATCH002-RC2:1.1.1.1
	netbsd-1-6-PATCH002-RC1:1.1.1.1
	netbsd-1-6:1.1.1.1.0.2
	netbsd-1-6-base:1.1.1.1
	v4-3-0:1.1.1.1
	XF86:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2005.03.18.14.55.04;	author tron;	state dead;
branches;
next	1.1;

1.1
date	2003.02.28.13.18.45;	author tron;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.02.28.13.18.45;	author tron;	state Exp;
branches
	1.1.1.1.8.1;
next	;

1.1.1.1.8.1
date	2005.04.06.20.00.15;	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/swrast_setup/Imakefile.inc,v 1.2 2002/11/14 21:01:17 tsi Exp $

#ifndef MesaSwrastSetupBuildDir
#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/src/swrast_setup/
#endif

MESASWRSETUPDIR = MesaSwrastSetupBuildDir

 MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \
		       $(MESASWRSETUPDIR)ss_triangle.c \
		       $(MESASWRSETUPDIR)ss_vb.c

#ifdef NeedToLinkMesaSrc
LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/swrast_setup)
LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/swrast_setup)
LinkSourceFile(ss_vb.c, $(MESASRCDIR)/src/swrast_setup)
#endif

 MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \
		       $(MESASWRSETUPDIR)ss_triangle.o \
		       $(MESASWRSETUPDIR)ss_vb.o

#if defined(DoSharedLib) && DoSharedLib
MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \
		       $(MESASWRSETUPDIR)unshared/ss_triangle.o \
		       $(MESASWRSETUPDIR)unshared/ss_vb.o
#else
MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS)
#endif

MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \
		       $(MESASWRSETUPDIR)debugger/ss_triangle.o \
		       $(MESASWRSETUPDIR)debugger/ss_vb.o

MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \
		       $(MESASWRSETUPDIR)profiled/ss_triangle.o \
		       $(MESASWRSETUPDIR)profiled/ss_vb.o

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import of XFree86 4.3.0.
@
text
@@


1.1.1.1.8.1
log
@Apply patch (requested by jmc in ticket #114):
Update XFree86 to version 4.5.0.
@
text
@@