glcore: split mesa and X in build system

GL/mesa/Makefile.am

@@ -1,9 +1,10 @@
-SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo
+SUBDIRS = X
+SUBDIRS += main math swrast swrast_setup tnl shader glapi vbo
 
 noinst_LTLIBRARIES = libGLcore.la
 
 libGLcore_la_SOURCES = dummy.c
-libGLcore_la_LIBADD = main/libmain.la \
+MESA_LIBS           = main/libmain.la \
                       math/libmath.la \
                       swrast/libswrast.la \
                       swrast_setup/libss.la \
@@ -12,4 +13,6 @@ libGLcore_la_LIBADD = main/libmain.la \
 		      shader/grammar/libgrammar.la \
 		      shader/slang/libslang.la \
                       vbo/libvbo.la \
+
+libGLcore_la_LIBADD = $(MESA_LIBS) \
                       X/libX.la

GL/mesa/X/Makefile.am

@@ -1,19 +1,10 @@
 noinst_LTLIBRARIES = libX.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I../X \
+           -I. \
-           -I../glapi \
+           -I@MESA_SOURCE@/src/mesa/glapi \
-           -I../main \
+           -I@MESA_SOURCE@/src/mesa/main \
-           -I../math \
+           -I@MESA_SOURCE@/src/mesa
-           -I../shader \
-           -I../swrast \
-           -I../swrast_setup \
-           -I../tnl \
-           -I.. \
-           -I../../glx \
-           -I$(top_srcdir)/GL/glx \
-           -I$(top_srcdir)/GL/include \
-           -I$(top_srcdir)/hw/xfree86/os-support
 
 # -DXFree86Server is required because the X11 driver in Mesa thinks that
 # symbol means "being built in the server"
@@ -22,12 +13,15 @@ AM_CFLAGS = \
 	-DXFree86Server \
 	@GLX_DEFINES@
 
-nodist_libX_la_SOURCES = \
+XM_SOURCES = \
-                  xm_api.c \
+	xm_api.c \
-		  xm_buffer.c \
+	xm_buffer.c \
-                  xm_dd.c \
+	xm_dd.c \
-                  xm_image.c \
+	xm_image.c \
-                  xm_line.c \
+	xm_line.c \
-                  xm_span.c \
+	xm_span.c \
-                  xm_tri.c \
+	xm_tri.c
-		  drivers/common/driverfuncs.c
+
+XM_SOURCES += drivers/common/driverfuncs.c
+
+nodist_libX_la_SOURCES = $(XM_SOURCES)