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.01;	author tron;	state dead;
branches;
next	1.1;

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

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

1.1.1.1.8.1
date	2005.04.06.20.00.13;	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/X/Imakefile.inc,v 1.4 2002/11/14 21:01:16 tsi Exp $

#ifndef MesaXBuildDir
#define MesaXBuildDir $(GLXLIBSRC)/mesa/src/X/
#endif

MESAXBUILDDIR = MesaXBuildDir

#ifndef MesaInXServer
XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \
		 $(MESAXBUILDDIR)glxapi.c \
		 $(MESAXBUILDDIR)realglx.c \
		 $(MESAXBUILDDIR)xfonts.c
#endif

   XMESA_SRCS = $(XMESA_GLX_SRCS) \
		$(MESAXBUILDDIR)xm_api.c \
		$(MESAXBUILDDIR)xm_dd.c \
		$(MESAXBUILDDIR)xm_line.c \
		$(MESAXBUILDDIR)xm_span.c \
		$(MESAXBUILDDIR)xm_tri.c

#ifdef NeedToLinkMesaSrc
#ifndef MesaInXServer
LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/X)
LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/X)
LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/X)
LinkSourceFile(realglx.c, $(MESASRCDIR)/src/X)
LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/X)
#endif
LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/X)
LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/X)
LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/X)
LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/X)
LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/X)
#endif

#ifndef MesaInXServer
XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \
		 $(MESAXBUILDDIR)glxapi.o \
		 $(MESAXBUILDDIR)realglx.o \
		 $(MESAXBUILDDIR)xfonts.o
#endif

   XMESA_OBJS = $(XMESA_GLX_OBJS) \
		$(MESAXBUILDDIR)xm_api.o \
		$(MESAXBUILDDIR)xm_dd.o \
		$(MESAXBUILDDIR)xm_line.o \
		$(MESAXBUILDDIR)xm_span.o \
		$(MESAXBUILDDIR)xm_tri.o

#if defined(DoSharedLib) && DoSharedLib
#ifndef MesaInXServer
XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \
		  $(MESAXBUILDDIR)unshared/glxapi.o \
		  $(MESAXBUILDDIR)unshared/realglx.o \
		  $(MESAXBUILDDIR)unshared/xfonts.o
#endif

  XMESA_UOBJS = $(XMESA_GLX_UOBJS) \
		$(MESAXBUILDDIR)unshared/xm_api.o \
		$(MESAXBUILDDIR)unshared/xm_dd.o \
		$(MESAXBUILDDIR)unshared/xm_line.o \
		$(MESAXBUILDDIR)unshared/xm_span.o \
		$(MESAXBUILDDIR)unshared/xm_tri.o
#else
XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS)
  XMESA_UOBJS = $(XMESA_OBJS)
#endif

#ifndef MesaInXServer
XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \
		  $(MESAXBUILDDIR)debugger/glxapi.o \
		  $(MESAXBUILDDIR)debugger/realglx.o \
		  $(MESAXBUILDDIR)debugger/xfonts.o
#endif

  XMESA_DOBJS = $(XMESA_GLX_DOBJS) \
		$(MESAXBUILDDIR)debugger/xm_api.o \
		$(MESAXBUILDDIR)debugger/xm_dd.o \
		$(MESAXBUILDDIR)debugger/xm_line.o \
		$(MESAXBUILDDIR)debugger/xm_span.o \
		$(MESAXBUILDDIR)debugger/xm_tri.o

#ifndef MesaInXServer
XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \
		  $(MESAXBUILDDIR)profiled/glxapi.o \
		  $(MESAXBUILDDIR)profiled/realglx.o \
		  $(MESAXBUILDDIR)profiled/xfonts.o
#endif

  XMESA_POBJS = $(XMESA_GLX_POBJS) \
		$(MESAXBUILDDIR)profiled/xm_api.o \
		$(MESAXBUILDDIR)profiled/xm_dd.o \
		$(MESAXBUILDDIR)profiled/xm_line.o \
		$(MESAXBUILDDIR)profiled/xm_span.o \
		$(MESAXBUILDDIR)profiled/xm_tri.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
@@