CVS Update: xc (branch: trunk)

[Adam Jackson]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	ajax at gabe.freedesktop.org	05/07/31 10:19:29

Log message:
  Post-merge fixups:
  - Disable building the gamma driver
  - Fix numerous Imakefiles to get header paths and subdirs right
  - Symlink client-side GLX lib source from Mesa
  - Add new shader subdirs to the Mesa core build
  - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need
    it, since they don't generate protocol, and it was breaking the
    build.

Modified files:
      ./:
        ChangeLog 
      xc/config/cf/:
        xorg.cf 
      xc/lib/GL/glx/:
        Imakefile 
      xc/lib/GL/mesa/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/common/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/ffb/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/gamma/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/i810/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/i915/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/mach64/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/mga/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/r128/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/r200/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/radeon/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/savage/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/sis/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/tdfx/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/unichrome/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/via/:
        Imakefile.inc 
      xc/lib/GL/mesa/drivers/x11/:
        Imakefile.inc 
      xc/lib/GL/mesa/main/:
        Imakefile.inc 
      xc/lib/GL/mesa/shader/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/swrast/:
        Imakefile.inc 
      xc/lib/GL/mesa/tnl/:
        Imakefile.inc 
      xc/programs/Xserver/GL/glx/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/GLcore/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/shader/:
        Imakefile 
      xc/programs/Xserver/hw/xfree86/drivers/ati/:
        atistruct.h 
      xc/programs/Xserver/hw/xfree86/drivers/glint/:
        glint.h 
      xc/programs/Xserver/hw/xfree86/drivers/i810/:
        i810.h i810_dri.h i830.h i830_dri.h 
      xc/programs/Xserver/hw/xfree86/drivers/mga/:
        mga.h mga_dri.h 
      xc/programs/Xserver/hw/xfree86/drivers/sis/:
        sis.h 
      xc/programs/Xserver/hw/xfree86/drivers/sunffb/:
        ffb_dri.c 
      xc/programs/Xserver/hw/xfree86/drivers/tdfx/:
        tdfx.h 
Added files:
      xc/lib/GL/mesa/shader/grammar/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/shader/slang/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/shader/slang/library/:
        Imakefile Imakefile.inc 
      xc/programs/Xserver/GL/mesa/shader/grammar/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/shader/slang/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/shader/slang/library/:
        Imakefile 
  
  Revision      Changes    Path
  1.1168        +58 -0     xc/ChangeLog
  1.52          +6 -6      xc/config/cf/xorg.cf
  1.10          +59 -16    xc/lib/GL/glx/Imakefile
  1.2           +15 -5     xc/lib/GL/mesa/Imakefile.inc
  1.2           +3 -2      xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/mach64/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc
  1.3           +1 -1      xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc
  1.2           +3 -2      xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc
  1.2           +3 -3      xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/savage/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc
  1.2           +1 -1      xc/lib/GL/mesa/drivers/dri/via/Imakefile.inc
  1.2           +6 -0      xc/lib/GL/mesa/drivers/x11/Imakefile.inc
  1.2           +41 -0     xc/lib/GL/mesa/main/Imakefile.inc
  1.3           +10 -0     xc/lib/GL/mesa/shader/Imakefile
  1.4           +26 -15    xc/lib/GL/mesa/shader/Imakefile.inc
  1.2           +7 -14     xc/lib/GL/mesa/swrast/Imakefile.inc
  1.5           +32 -12    xc/lib/GL/mesa/tnl/Imakefile.inc
  1.8           +4 -2      xc/programs/Xserver/GL/glx/Imakefile
  1.4           +6 -1      xc/programs/Xserver/GL/mesa/GLcore/Imakefile
  1.2           +7 -3      xc/programs/Xserver/GL/mesa/shader/Imakefile
  1.5           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h
  1.3           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h
  1.8           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h
  1.5           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
  1.12          +0 -1      xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
  1.6           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
  1.9           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
  1.7           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h
  1.50          +0 -1      xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h
  1.7           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
  1.3           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h