diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-27 15:43:15 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-27 15:43:15 -0800 |
| commit | b4b0d901d98371a8aa7b17d195e18e83e2a6a618 (patch) | |
| tree | ee12953f0708194e3d77c0831fd0fe0e336bceb0 /hw/xfree86/vgahw/Makefile.am | |
| parent | 64de3baf85f6df274f71f736016f0848567cd9f6 (diff) | |
| parent | d6cd0313c7f23f32c9c7dda00ff739e772bf7db3 (diff) | |
Merge branch 'randr-1.2'
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
Diffstat (limited to 'hw/xfree86/vgahw/Makefile.am')
| -rw-r--r-- | hw/xfree86/vgahw/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am index 2aa27fa41..f48e46a11 100644 --- a/hw/xfree86/vgahw/Makefile.am +++ b/hw/xfree86/vgahw/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) sdk_HEADERS = vgaHW.h |