diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/glx/Makefile.am | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/glx/Makefile.am')
| -rw-r--r-- | xorg-server/glx/Makefile.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/xorg-server/glx/Makefile.am b/xorg-server/glx/Makefile.am index 0214295ea..6facc2011 100644 --- a/xorg-server/glx/Makefile.am +++ b/xorg-server/glx/Makefile.am @@ -22,9 +22,12 @@ INCLUDES = \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/dri \ - -I$(top_srcdir)/hw/xfree86/dri2 \ -I$(top_srcdir)/mi +if DRI2_AIGLX +INCLUDES += -I$(top_srcdir)/hw/xfree86/dri2 +endif + glapi_sources = \ indirect_dispatch.c \ indirect_dispatch.h \ @@ -41,21 +44,19 @@ glapi_sources = \ glapi.c \ glapi.h \ glapioffsets.h \ + glprocs.h \ glthread.c \ - glthread.h \ - glprocs.h - -if DRI2 -GLXDRI_SOURCE = glxdri2.c -endif + glthread.h libglxdri_la_SOURCES = \ glxdri.c \ - $(GLXDRI2_SOURCE) \ - glxdricommon.h \ extension_string.c \ extension_string.h +if DRI2_AIGLX +libglxdri_la_SOURCES += glxdri2.c +endif + libglx_la_SOURCES = \ $(indirect_sources) \ $(glapi_sources) \ @@ -74,10 +75,10 @@ libglx_la_SOURCES = \ glxext.h \ glxdriswrast.c \ glxdricommon.c \ + glxdricommon.h \ glxscreens.c \ glxscreens.h \ glxserver.h \ - glxutil.c \ glxutil.h \ render2.c \ render2swap.c \ |