xserver/GL/mesa Makefile.am,1.6,1.7

Committed by: airlied

Update of /cvs/xserver/xserver/GL/mesa
In directory gabe:/tmp/cvs-serv19869/GL/mesa

Modified Files:
	Makefile.am 
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.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/GL/mesa/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	23 Dec 2005 01:11:13 -0000	1.6
+++ Makefile.am	23 Dec 2005 02:07:57 -0000	1.7
@@ -1,3 +1,10 @@
+noinst_LIBRARIES = libxf86glxddx.a
+
+libxf86glxddx_a_SOURCES = \
+	X/xf86glxddx.c
+
+noinst_LTLIBRARIES = libglcore.la
+
 MESASRCDIR = @MESA_SOURCE@/src/mesa
 MESADISTDIR = $(top_distdir)/GL/mesa
 MESADISTSRCDIR = $(MESADISTDIR)/src/mesa
@@ -197,20 +204,7 @@
 	$(MESASRCDIR)/drivers/x11/xm_tri.c \
 	$(MESASRCDIR)/drivers/x11/xm_buffer.c
 
-X_SRCS = \
-	X/xf86glx.c \
-	X/xf86glx_util.c \
-	X/xf86glx_util.h \
-	X/xf86glxint.h \
-	X/compsize.c \
-	X/size.h
-
-noinst_LIBRARIES = libglcore.a
-
-libglcore_a_SOURCES = \
-	$(X_SRCS)
-
-nodist_libglcore_a_SOURCES = \
+MESA_SRCS = \
 	$(MESA_BASE_SRCS) \
 	$(MESA_AC_SRCS) \
 	$(MESA_SHADER_SRCS) \
@@ -222,7 +216,15 @@
 	$(MESA_COMMON_SRCS) \
 	$(MESA_X11_SRCS)
 
-libglcore_a_CFLAGS = -UHAVE_CONFIG_H -DGLXEXT -DXF86DRI \
+X_SRCS = \
+	X/xf86glx.c \
+	X/xf86glx_util.c \
+	X/xf86glx_util.h \
+	X/xf86glxint.h
+
+libglcore_la_SOURCES = $(X_SRCS)
+nodist_libglcore_la_SOURCES = $(MESA_SRCS)
+libglcore_la_CFLAGS = -UHAVE_CONFIG_H -DGLXEXT -DXF86DRI \
 	-DGLX_DIRECT_RENDERING -DGLX_USE_DLOPEN -DGLX_USE_MESA \
 	-DXFree86Server -DUSE_MGL_NAMESPACE