[PATCH] Always install xaa sdk headers

[Jeremy Huddleston]

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Jan 3, 2012, at 1:22 AM, Peter Hutterer wrote:

> From: Adam Jackson <ajax at redhat.com>
> 
> Always install XAA SDK headers so drivers still build even with
> --disable-xaa
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> hw/xfree86/Makefile.am     |    2 --
> hw/xfree86/xaa/Makefile.am |    4 ++++
> 2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index 4f08772..72be889 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -11,9 +11,7 @@ if XF86UTILS
> XF86UTILS_SUBDIR = utils
> endif
> 
> -if XAA
> XAA_SUBDIR = xaa
> -endif
> 
> if VGAHW
> VGAHW_SUBDIR = vgahw
> diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
> index 7ebe0b9..78d9348 100644
> --- a/hw/xfree86/xaa/Makefile.am
> +++ b/hw/xfree86/xaa/Makefile.am
> @@ -8,6 +8,8 @@ MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c
> MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
> POLYSEG = s-xaaLine.c s-xaaDashLine.c
> 
> +if XAA
> +
> libxaa_la_LDFLAGS = -module -avoid-version
> if COMPOSITE
> libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
> @@ -60,6 +62,8 @@ ${MSB_3_FIXED}:
> 	$(AM_V_GEN)echo "#define FIXEDBASE" >> $@
> 	$(AM_V_GEN)echo '#include "$(srcdir)/${@:mf3-%=%}"' >> $@
> 
> +endif # XAA
> +
> DISTCLEANFILES = $(POLYSEG) \
> 	$(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED) \
> 	$(LSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIRST) $(MSB_3_FIXED)
> -- 
> 1.7.8
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>