From f593d6eca47fbea066dea42c074f66f6b82769b5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 23 Nov 2009 08:28:15 +0000
Subject: Synchronised makefile and makefile.am

---
 xorg-server/glx/makefile | 43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

(limited to 'xorg-server/glx')

diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile
index 3216cdc88..65eac87fb 100644
--- a/xorg-server/glx/makefile
+++ b/xorg-server/glx/makefile
@@ -1,9 +1,42 @@
+LIBRARY=libglx
+
 DEFINES += GLAPIENTRY=__stdcall
 
-CSRCS=glapi.c glthread.c glxcmds.c glxcmdsswap.c glxdricommon.c glxext.c glxscreens.c \
-indirect_dispatch.c indirect_dispatch_swap.c indirect_program.c indirect_reqsize.c indirect_size_get.c indirect_table.c indirect_texture_compression.c \
-indirect_util.c render2.c render2swap.c renderpix.c renderpixswap.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c singlesize.c \
-swap_interval.c xfont.c glxdriswrast.c extension_string.c 
 
-LIBRARY=libglx
+glapi_sources =					\
+	indirect_dispatch.c			\
+	indirect_dispatch_swap.c		\
+	indirect_reqsize.c			\
+	indirect_size_get.c			\
+	indirect_table.c			\
+	glapi.c					\
+	glthread.c
+libglxdri_la_SOURCES = \
+        extension_string.c
+
+CSRCS = \
+	$(indirect_sources) \
+	$(glapi_sources) \
+	$(libglxdri_la_SOURCES) \
+	indirect_util.c \
+	indirect_program.c \
+	indirect_texture_compression.c \
+        glxcmds.c \
+        glxcmdsswap.c \
+        glxext.c \
+	glxdriswrast.c \
+	glxdricommon.c \
+        glxscreens.c \
+        render2.c \
+        render2swap.c \
+        renderpix.c \
+        renderpixswap.c \
+        rensize.c \
+        single2.c \
+        single2swap.c \
+        singlepix.c \
+        singlepixswap.c \
+        singlesize.c \
+        swap_interval.c \
+        xfont.c
 
-- 
cgit v1.2.3