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.2.6.1
	netbsd-3-1:1.1.1.2.6.1.0.2
	netbsd-3-1-RELEASE:1.1.1.2.6.1
	netbsd-3-1-RC4:1.1.1.2.6.1
	netbsd-3-1-RC3:1.1.1.2.6.1
	netbsd-3-1-RC2:1.1.1.2.6.1
	netbsd-3-1-RC1:1.1.1.2.6.1
	netbsd-3-0-RC4:1.1.1.2.6.1
	netbsd-2-0-3-RELEASE:1.1.1.2
	netbsd-2-1:1.1.1.2.0.8
	netbsd-2-1-RELEASE:1.1.1.2
	netbsd-2-1-RC6:1.1.1.2
	netbsd-2-1-RC5:1.1.1.2
	netbsd-2-1-RC4:1.1.1.2
	netbsd-2-1-RC3:1.1.1.2
	netbsd-2-1-RC2:1.1.1.2
	netbsd-2-1-RC1:1.1.1.2
	netbsd-2-0-2-RELEASE:1.1.1.2
	v4-5-0_beforeimport:1.1.1.2
	netbsd-3:1.1.1.2.0.6
	netbsd-3-base:1.1.1.2
	netbsd-2-0-1-RELEASE:1.1.1.2
	netbsd-2:1.1.1.2.0.4
	netbsd-2-base:1.1.1.2
	netbsd-2-0-RELEASE:1.1.1.2
	netbsd-2-0-RC5:1.1.1.2
	netbsd-2-0-RC4:1.1.1.2
	netbsd-2-0-RC3:1.1.1.2
	netbsd-2-0-RC2:1.1.1.2
	netbsd-2-0-RC1:1.1.1.2
	netbsd-2-0:1.1.1.2.0.2
	netbsd-2-0-base:1.1.1.2
	v4-4-0:1.1.1.2
	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;
next	1.1.1.2;

1.1.1.2
date	2004.03.05.14.24.05;	author tron;	state Exp;
branches
	1.1.1.2.6.1;
next	;

1.1.1.2.6.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/math/Imakefile.inc,v 1.2 2002/11/14 21:01:17 tsi Exp $

#ifndef MesaMathBuildDir
#define MesaMathBuildDir $(GLXLIBSRC)/mesa/src/math/
#endif

MESAMATHBUILDDIR = MesaMathBuildDir

  MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \
		   $(MESAMATHBUILDDIR)m_debug_norm.c \
		   $(MESAMATHBUILDDIR)m_debug_xform.c \
		   $(MESAMATHBUILDDIR)m_debug_vertex.c \
		   $(MESAMATHBUILDDIR)m_eval.c \
		   $(MESAMATHBUILDDIR)m_matrix.c \
		   $(MESAMATHBUILDDIR)m_translate.c \
		   $(MESAMATHBUILDDIR)m_vector.c \
		   $(MESAMATHBUILDDIR)m_vertices.c \
		   $(MESAMATHBUILDDIR)m_xform.c

#ifdef NeedToLinkMesaSrc
LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_debug_vertex.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_vertices.c, $(MESASRCDIR)/src/math)
LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math)
#endif

  MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
		   $(MESAMATHBUILDDIR)m_debug_norm.o \
		   $(MESAMATHBUILDDIR)m_debug_xform.o \
		   $(MESAMATHBUILDDIR)m_debug_vertex.o \
		   $(MESAMATHBUILDDIR)m_eval.o \
		   $(MESAMATHBUILDDIR)m_matrix.o \
		   $(MESAMATHBUILDDIR)m_translate.o \
		   $(MESAMATHBUILDDIR)m_vector.o \
		   $(MESAMATHBUILDDIR)m_vertices.o \
		   $(MESAMATHBUILDDIR)m_xform.o

#if defined(DoSharedLib) && DoSharedLib
 MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
		   $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
		   $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
		   $(MESAMATHBUILDDIR)unshared/m_debug_vertex.o \
		   $(MESAMATHBUILDDIR)unshared/m_eval.o \
		   $(MESAMATHBUILDDIR)unshared/m_matrix.o \
		   $(MESAMATHBUILDDIR)unshared/m_translate.o \
		   $(MESAMATHBUILDDIR)unshared/m_vector.o \
		   $(MESAMATHBUILDDIR)unshared/m_vertices.o \
		   $(MESAMATHBUILDDIR)unshared/m_xform.o
#else
 MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
#endif

 MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
		   $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
		   $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \
		   $(MESAMATHBUILDDIR)debugger/m_debug_vertex.o \
		   $(MESAMATHBUILDDIR)debugger/m_eval.o \
		   $(MESAMATHBUILDDIR)debugger/m_matrix.o \
		   $(MESAMATHBUILDDIR)debugger/m_translate.o \
		   $(MESAMATHBUILDDIR)debugger/m_vector.o \
		   $(MESAMATHBUILDDIR)debugger/m_vertices.o \
		   $(MESAMATHBUILDDIR)debugger/m_xform.o

 MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
		   $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
		   $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \
		   $(MESAMATHBUILDDIR)profiled/m_debug_vertex.o \
		   $(MESAMATHBUILDDIR)profiled/m_eval.o \
		   $(MESAMATHBUILDDIR)profiled/m_matrix.o \
		   $(MESAMATHBUILDDIR)profiled/m_translate.o \
		   $(MESAMATHBUILDDIR)profiled/m_vector.o \
		   $(MESAMATHBUILDDIR)profiled/m_vertices.o \
		   $(MESAMATHBUILDDIR)profiled/m_xform.o

@


1.1
log
@Initial revision
@
text
@@


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


1.1.1.2
log
@Import of XFree86 4.4.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.3 2003/09/28 20:15:39 alanh Exp $
d12 1
d17 1
d23 1
d29 1
d36 1
d41 1
d48 1
d53 1
d62 1
d67 1
d73 1
d78 1
@


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