Index: config/cf/X11.tmpl =================================================================== RCS file: /cvs/dri/xc/xc/config/cf/X11.tmpl,v retrieving revision 1.32 diff -u -u -r1.32 X11.tmpl --- a/config/cf/X11.tmpl 9 Oct 2003 09:55:57 -0000 1.32 +++ b/config/cf/X11.tmpl 17 Mar 2004 03:51:54 -0000 @@ -868,6 +868,9 @@ #define GlxDefines /**/ #endif #endif +#ifndef DRMSrcDir +#define DRMSrcDir $(TOP)/extras/DRM +#endif #ifndef MesaSrcDir #define MesaSrcDir $(TOP)/extras/Mesa #endif @@ -1608,6 +1611,7 @@ FTSOURCEDIR = FreeTypeSrcDir XTTSOURCEDIR = XTrueTypeSrcDir MESASRCDIR = MesaSrcDir + DRMSRCDIR = DRMSrcDir OGLSAMPLESRCDIR = OglSampleSrcDir PSWRAPSRC = $(XTOP)/config/pswrap TRANSCOMMSRC = $(LIBSRC)/xtrans Index: config/cf/host.def =================================================================== RCS file: /cvs/dri/xc/xc/config/cf/host.def,v retrieving revision 1.65 diff -u -u -r1.65 host.def --- a/config/cf/host.def 12 Feb 2004 16:35:32 -0000 1.65 +++ b/config/cf/host.def 17 Mar 2004 03:51:55 -0000 @@ -5,7 +5,8 @@ #define XFree86CustomVersion "DRI trunk" /* You need this now */ -#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa-newtree +#define MesaSrcDir /home/mesa/Mesa +#define DRMSrcDir /home/dri/drm /* Don't use any special flags by default, but leave this here commented out Index: lib/GL/dri/drm/Imakefile =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/dri/drm/Imakefile,v retrieving revision 1.27 diff -u -u -r1.27 Imakefile --- a/lib/GL/dri/drm/Imakefile 5 Nov 2003 13:09:55 -0000 1.27 +++ b/lib/GL/dri/drm/Imakefile 17 Mar 2004 03:51:57 -0000 @@ -21,8 +21,8 @@ DEFINES = $(ALLOC_DEFINES) INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(XF86OSSRC)/$(OS_SUBDIR)/drm \ - -I$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel \ - -I$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel \ + -I$(DRMSRCDIR)/$(OS_SUBDIR) \ + -I$(DRMSRCDIR)/$(OS_SUBDIR2) \ -I$(XF86OSSRC) SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o @@ -45,7 +45,7 @@ LinkSourceFile(xf86drmRandom.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm) LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm) -LinkSourceFile(drm.h,$(XF86OSSRC)/$(OS_SUBDIR3)/drm/kernel) +LinkSourceFile(drm.h,$(DRMSRCDIR)/$(OS_SUBDIR3)) #include Index: lib/GL/mesa/drivers/dri/ffb/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc 9 Dec 2003 15:33:35 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/gamma/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc 9 Dec 2003 15:33:35 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/glint \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/i810/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/i810/Imakefile.inc 9 Dec 2003 15:33:35 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/i810/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/i810 \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/i830/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/i830/Imakefile.inc 19 Jan 2004 22:45:56 -0000 1.3 +++ b/lib/GL/mesa/drivers/dri/i830/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/i810 \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/mga/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/mga/Imakefile.inc 3 Mar 2004 21:58:00 -0000 1.3 +++ b/lib/GL/mesa/drivers/dri/mga/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/mga \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/r128/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/r128/Imakefile.inc 9 Dec 2003 15:33:35 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/r128/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -24,7 +24,7 @@ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ -I$(XF86COMSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/ati \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/r200/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/r200/Imakefile.inc 3 Mar 2004 21:58:00 -0000 1.3 +++ b/lib/GL/mesa/drivers/dri/r200/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -24,7 +24,7 @@ -I$(SERVERSRC)/GL/dri \ -I$(XF86COMSRC) \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/ati \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/radeon/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc 3 Mar 2004 22:03:00 -0000 1.3 +++ b/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -24,7 +24,7 @@ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ -I$(XF86COMSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/ati \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/savage/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/savage/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/savage/Imakefile.inc 26 Feb 2004 01:00:43 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/savage/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/savage \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/sis/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/sis/Imakefile.inc 9 Dec 2003 15:33:35 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/sis/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/sis \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc =================================================================== RCS file: /cvs/dri/xc/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile.inc --- a/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc 9 Dec 2003 15:33:36 -0000 1.2 +++ b/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc 17 Mar 2004 03:51:57 -0000 @@ -23,7 +23,7 @@ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ -I$(XF86OSSRC) \ - -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(DRMSRCDIR)/shared \ -I$(XF86DRIVERSRC)/tdfx \ -I$(GLXLIBSRC)/dri/drm #endif Index: lib/XvMC/hw/i810/Imakefile =================================================================== RCS file: /cvs/dri/xc/xc/lib/XvMC/hw/i810/Imakefile,v retrieving revision 1.3 diff -u -u -r1.3 Imakefile --- a/lib/XvMC/hw/i810/Imakefile 25 Mar 2003 14:01:17 -0000 1.3 +++ b/lib/XvMC/hw/i810/Imakefile 17 Mar 2004 03:51:57 -0000 @@ -19,7 +19,7 @@ DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0 INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \ - -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \ + -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(DRMSRCDIR)/linux \ -I$(XF86DRIVERSRC)/i810 SRCS = I810XvMC.c OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile =================================================================== RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile,v retrieving revision 1.15 diff -u -u -r1.15 Imakefile --- a/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile 16 Sep 2003 20:53:33 -0000 1.15 +++ b/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile 17 Mar 2004 03:52:04 -0000 @@ -41,7 +41,7 @@ $(MOBJ) INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../.. -Ikernel + -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../.. -I$(DRMSRCDIR)/bsd DEFINES = $(MTRR_DEFINES) $(GLX_DEFINES) @@ -50,12 +50,6 @@ NormalLintTarget($(SRCS)) InstallLibraryModule(drm,$(MODULEDIR),$(OS_SUBDIR)) - -#define IHaveSubdirs -SUBDIRS = kernel - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) #endif DependTarget() Index: programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile =================================================================== RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile,v retrieving revision 1.16 diff -u -u -r1.16 Imakefile --- a/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile 12 Sep 2003 20:00:57 -0000 1.16 +++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile 17 Mar 2004 03:52:04 -0000 @@ -33,7 +33,7 @@ $(MOBJ) INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../.. -Ikernel + -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../.. -I$(DRMSRCDIR)/linux DEFINES = $(MTRR_DEFINES) $(GLX_DEFINES) @@ -55,13 +55,7 @@ #endif -#define IHaveSubdirs -SUBDIRS = kernel - DependTarget() - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) #endif