diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/glx | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/Makefile.am b/xorg-server/glx/Makefile.am index 591c4ac66..d1c203dc9 100644 --- a/xorg-server/glx/Makefile.am +++ b/xorg-server/glx/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = \ # none yet #sdk_HEADERS = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/hw/xfree86/common \ @@ -23,7 +23,7 @@ INCLUDES = \ -I$(top_srcdir)/mi if DRI2_AIGLX -INCLUDES += -I$(top_srcdir)/hw/xfree86/dri2 +AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/dri2 endif glapi_sources = \ |