fixing the recurring Mesa build problem

[Brian Paul]

Brian Paul wrote:
> 
> Every time we add/remove sources files in Mesa we have to update several 
> files in the X.org xserver tree.  I'd like to fix that.
> 
> My plan is this:
> 
> 1. Add a 'sources' file in Mesa for each subdir which lists the .c 
> files.  For example, src/mesa/main/sources will contain:
> 
> MAIN_SOURCES = \
> accum.c \
> api_arrayelt.c \
> api_loopback.c \
> api_noop.c \
> api_validate.c \
> arrayobj.c \
> attrib.c \
> blend.c \
> [etc...]
> 
> The Mesa developers will update the various 'sources' files whenever we 
> add/remove files.
> 
> 
> 2. In the xserver tree, change the Makefile.am files under GL/mesa/ to 
> include the new 'sources' file.  For example, 
> xserver/GL/mesa/main/Makefile.am will contain:
> 
> [...]
> 
> include sources
> 
> nodist_libmain_la_SOURCES = $(MAIN_SOURCES)
> 
> 
> 3. Update the xserver/GL/symlinks-mesa.sh script to link in the new 
> 'sources' files from the Mesa tree.
> 
> 
> Sound good?

I haven't seen any follow-ups, so I'll proceed with this.


> Another issue is the Mesa directory skeleton under xserver/GL/mesa/ 
> doesn't quite match the Mesa CVS directory tree.  Specifically, the 
> xserver/GL/mesa/X/ directory should be renamed or moved to 
> xserver/GL/mesa/drivers/x11/.  There should also be an 
> xserver/GL/mesa/drivers/common/ subdir.
> 
> I'd appreciate it if someone more proficient with git would take care of 
> this task first.  I'll take care of step 1-3 then.

I'd still like help with this part.  Is the recent mis-merge that's 
been discussed a roadblock here?

-Brian