diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
| commit | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch) | |
| tree | a4b168a1b2c686548550719b094e982124696f3d /xorg-server/hw/xfree86/x86emu/Makefile.am | |
| parent | 5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff) | |
| parent | b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff) | |
| download | vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2 vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/x86emu/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/x86emu/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/x86emu/Makefile.am b/xorg-server/hw/xfree86/x86emu/Makefile.am index e7368f531..df9697767 100644 --- a/xorg-server/hw/xfree86/x86emu/Makefile.am +++ b/xorg-server/hw/xfree86/x86emu/Makefile.am @@ -11,7 +11,7 @@ libx86emu_la_SOURCES = debug.c \ sys.c \ x86emu.h -INCLUDES = $(XORG_INCS) +INCLUDES = AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) |