xserver/hw/xgl/glxext/module Makefile.am, NONE, 1.1 glcoremodule.c, NONE, 1.1 glxmodule.c, NONE, 1.1

Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl/glxext/module
In directory gabe:/tmp/cvs-serv19869/hw/xgl/glxext/module

Added Files:
	Makefile.am glcoremodule.c glxmodule.c 
Log Message:
Well there were a couple of snapshots later than CVS available outside of 
Novell, so I've done a crazy merge to try and get them into a workable 
CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if I did.


--- NEW FILE: Makefile.am ---
INCLUDES =		 \
	@XGLX_INCS@	 \
	@XSERVER_CFLAGS@

libglx_la_LDFLAGS = -avoid-version
libglx_la_SOURCES = glxmodule.c
libglx_la_LIBADD  = $(top_builddir)/GL/glx/libglx.la
libglx_modules    = libglx.la

libglcore_la_LDFLAGS = -avoid-version
libglcore_la_SOURCES = glcoremodule.c
libglcore_la_LIBADD  = $(top_builddir)/GL/mesa/libglcore.la
libglcore_modules    = libglcore.la

moduledir = @MODULEPATH@/xgl

module_LTLIBRARIES =	     \
	$(libglcore_modules) \
	$(libglx_modules)
--- NEW FILE: glcoremodule.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: glxmodule.c ---
(This appears to be a binary file; contents omitted.)