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.5.8.1 netbsd-3-1:1.1.1.5.8.1.0.2 netbsd-3-1-RELEASE:1.1.1.5.8.1 netbsd-3-1-RC4:1.1.1.5.8.1 netbsd-3-1-RC3:1.1.1.5.8.1 netbsd-3-1-RC2:1.1.1.5.8.1 netbsd-3-1-RC1:1.1.1.5.8.1 netbsd-3-0-RC4:1.1.1.5.8.1 netbsd-2-0-3-RELEASE:1.1.1.5 netbsd-2-1:1.1.1.5.0.10 netbsd-2-1-RELEASE:1.1.1.5 netbsd-2-1-RC6:1.1.1.5 netbsd-2-1-RC5:1.1.1.5 netbsd-2-1-RC4:1.1.1.5 netbsd-2-1-RC3:1.1.1.5 netbsd-2-1-RC2:1.1.1.5 netbsd-2-1-RC1:1.1.1.5 netbsd-2-0-2-RELEASE:1.1.1.5 v4-5-0_beforeimport:1.1.1.5 netbsd-3:1.1.1.5.0.8 netbsd-3-base:1.1.1.5 netbsd-2-0-1-RELEASE:1.1.1.5 netbsd-2:1.1.1.5.0.6 netbsd-2-base:1.1.1.5 netbsd-2-0-RELEASE:1.1.1.5 netbsd-2-0-RC5:1.1.1.5 netbsd-2-0-RC4:1.1.1.5 netbsd-2-0-RC3:1.1.1.5 netbsd-2-0-RC2:1.1.1.5 netbsd-2-0-RC1:1.1.1.5 netbsd-2-0:1.1.1.5.0.4 netbsd-2-0-base:1.1.1.5 v4-4-0:1.1.1.5 v4-4-0_beforeimport:1.1.1.5 netbsd-1-6-PATCH002-RELEASE:1.1.1.5 netbsd-1-6-PATCH002:1.1.1.5 netbsd-1-6-PATCH002-RC4:1.1.1.5 v4-3-0-2003-12-19:1.1.1.5 netbsd-1-6-PATCH002-RC3:1.1.1.5 netbsd-1-6-PATCH002-RC2:1.1.1.5 netbsd-1-6-PATCH002-RC1:1.1.1.5 netbsd-1-6:1.1.1.5.0.2 netbsd-1-6-base:1.1.1.5 v4-3-0:1.1.1.5 v4-3-0_beforeimport:1.1.1.4 netbsd-1-6-PATCH001:1.1.1.4 netbsd-1-6-RELEASE:1.1.1.4 v4-2-1:1.1.1.4 v4-2-1_beforeimport:1.1.1.4 netbsd-1-5-PATCH003:1.1.1.4 v4-2-0:1.1.1.4 netbsd-1-5-PATCH002:1.1.1.3 netbsd-1-5-PATCH001:1.1.1.2 v4-1-0:1.1.1.3 v4-0-3:1.1.1.2 v4-0-2:1.1.1.1 XF86:1.1.1; locks; strict; comment @# @; 1.2 date 2005.03.18.14.55.10; author tron; state dead; branches; next 1.1; 1.1 date 2001.01.01.12.45.02; author veego; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.01.01.12.45.02; author veego; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2001.03.18.17.16.37; author veego; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2001.06.09.14.58.08; author tron; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2002.01.19.14.59.56; author tron; state Exp; branches; next 1.1.1.5; 1.1.1.5 date 2003.02.28.13.19.44; author tron; state Exp; branches 1.1.1.5.8.1; next ; 1.1.1.5.8.1 date 2005.04.06.20.00.25; author tron; state dead; branches; next ; desc @@ 1.2 log @Resolve conflicts from import of XFree86 4.5.0. @ text @XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ #define IHaveModules #include LinkSourceFile(xmesa1.c,$(MESASRCDIR)/src/X) LinkSourceFile(xmesa2.c,$(MESASRCDIR)/src/X) LinkSourceFile(xmesa3.c,$(MESASRCDIR)/src/X) LinkSourceFile(xmesa4.c,$(MESASRCDIR)/src/X) LinkSourceFile(xmesaP.h,$(MESASRCDIR)/src/X) LinkSourceFile(glxheader.h,$(MESASRCDIR)/src/X) LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx) LinkSourceFile(size.h,$(LIBSRC)/GL/glx) DRIVER_SRCS = xmesa1.c xmesa2.c xmesa3.c xmesa4.c DRIVER_OBJS = xmesa1.o xmesa2.o xmesa3.o xmesa4.o GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o SRCS = $(DRIVER_SRCS) $(GLX_SRCS) OBJS = $(DRIVER_OBJS) $(GLX_OBJS) INCLUDES = -I. -I.. -I../../include \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I../../../include -I../../../glx \ -I$(LIBSRC)/GL/include \ -I$(XF86SRC) -I$(XTOP)/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ #if DoLoadableServer ModuleObjectRule() SubdirLibraryRule($(OBJS)) #else NormalLibraryTarget(GLcoreX,$(OBJS)) NormalLibraryObjectRule() #endif LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Initial import of XFree86 4.x @ text @@ 1.1.1.2 log @Import of XFree86 4.0.3 @ text @d1 1 a1 1 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.7 2000/02/23 04:46:56 martin Exp $ @ 1.1.1.3 log @Import of XFree86 4.1.0. @ text @d1 1 a1 1 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.9 2001/04/26 16:54:47 dawes Exp $ d10 2 d14 1 d25 5 a29 6 INCLUDES = -I. -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(MESASRCDIR)/src -I$(MESASRCDIR)/src/X \ -I$(MESASRCDIR)/include \ -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \ -I$(SERVERSRC)/include -I$(SERVERSRC)/GL/include \ -I$(SERVERSRC)/GL/glx @ 1.1.1.4 log @Import of XFree86 4.2.0. @ text @d1 1 a1 1 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.11 2002/01/10 21:51:47 tsi Exp $ a15 7 #ifndef XFree86Version /* This appears to be the quickest way to build a non-XFree86 server */ GLXSRV_DEFINES = -DXFree86Server #endif d29 1 a29 1 DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) /*-DUSE_X86_ASM*/ @ 1.1.1.5 log @Import of XFree86 4.3.0. @ text @d1 1 a1 1 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $ a2 2 #if DoLoadableServer #if !BuildModuleInSubdir a3 6 #elif !defined(IHaveModules) #define IHaveSubdirs SUBDIRS = module #endif #endif d6 4 a9 10 #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaXBuildDir /**/ #define MesaInXServer #if !defined(IHaveModules) || !BuildModuleInSubdir #include "../../../../../../lib/GL/mesa/src/X/Imakefile.inc" #else #include "../../../../../../../lib/GL/mesa/src/X/Imakefile.inc" #endif d13 2 a14 2 DRIVER_SRCS = $(XMESA_SRCS) DRIVER_OBJS = $(XMESA_OBJS) d29 1 a29 2 INCLUDES = -I$(SERVERSRC)/GL/mesa/src/X -I$(INCLUDESRC) -I$(XINCLUDESRC) \ -I$(EXTINCSRC) \ d36 1 a36 1 DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ d38 1 a38 1 #ifdef IHaveModules d40 1 d42 1 a45 2 SubdirLibraryRule($(OBJS)) a49 11 #ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif #if defined(IHaveModules) && BuildModuleInSubdir LinkSourceFile(xf86glx.c,..) LinkSourceFile(xf86glx_util.c,..) #endif @ 1.1.1.5.8.1 log @Apply patch (requested by jmc in ticket #114): Update XFree86 to version 4.5.0. @ text @@