Re: [PATCH] Always install xaa sdk headers

2012-01-03 Thread Adam Jackson 

On 1/3/12 2:18 PM, Julien Cristau wrote:

On Tue, Jan  3, 2012 at 16:22:24 +1000, Peter Hutterer wrote:


From: Adam Jackson

Always install XAA SDK headers so drivers still build even with
--disable-xaa

Signed-off-by: Peter Hutterer
---
  hw/xfree86/Makefile.am |2 --
  hw/xfree86/xaa/Makefile.am |4 
  2 files changed, 4 insertions(+), 2 deletions(-)


ajax updated a bunch of drivers to cope better, but mga is still not
fixed for this afaict.


The intent with my most recent round of XAA fixes was to make it 
runtime-optional; libxaa can exist or not and the drivers will survive. 
 Build-time ifdefs seemed like more hassle than I wanted to deal with, 
but if someone else wants to, go wild.


- ajax

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] Always install xaa sdk headers

2012-01-03 Thread Julien Cristau 
On Tue, Jan  3, 2012 at 16:22:24 +1000, Peter Hutterer wrote:

> From: Adam Jackson 
> 
> Always install XAA SDK headers so drivers still build even with
> --disable-xaa
> 
> Signed-off-by: Peter Hutterer 
> ---
>  hw/xfree86/Makefile.am |2 --
>  hw/xfree86/xaa/Makefile.am |4 
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
ajax updated a bunch of drivers to cope better, but mga is still not
fixed for this afaict.

Cheers,
Julien
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] Always install xaa sdk headers

2012-01-02 Thread Jeremy Huddleston 
Reviewed-by: Jeremy Huddleston 

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

> From: Adam Jackson 
> 
> Always install XAA SDK headers so drivers still build even with
> --disable-xaa
> 
> Signed-off-by: Peter Hutterer 
> ---
> 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@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH] Always install xaa sdk headers

2012-01-02 Thread Peter Hutterer 
From: Adam Jackson 

Always install XAA SDK headers so drivers still build even with
--disable-xaa

Signed-off-by: Peter Hutterer 
---
 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@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel