[xserver-commit] xfree86/xaa Makefile.am,3.2,3.3

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/xaa
In directory pdx:/tmp/cvs-serv15855/xaa

Modified Files:
	Makefile.am 
Log Message:
* xaa/Makefile.am, xaa/*/Makefile.am:
  Fix XAA building: finally replace xaaSeg/xaaDashSeg with more evil
  other-lib stupidness. Fix _SOURCES vs _LIBADD bogosity.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/Makefile.am,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -d -r3.2 -r3.3
--- a/Makefile.am	28 Feb 2004 01:28:02 -0000	3.2
+++ b/Makefile.am	3 Mar 2004 12:23:59 -0000	3.3
@@ -3,16 +3,22 @@
 
 SUBDIRS = lsb_first msb_first lsb_fixed msb_fixed
 
-lib_LIBRARIES = libxf86xaa.a
+lib_LIBRARIES = libxf86xaa.a libxf86xaaseg.a
 libxf86xaa_a_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
                        xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
                        xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \
                        xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c \
                        xaaPaintWin.c xaaRect.c xaaLineMisc.c xaaBitOrder.c \
                        xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
-                       xaaLine.c xaaSeg.c xaaDashLine.c xaaDashSeg.c \
-                       xaaOverlay.c xaaOffscreen.c xaaOverlayDF.c \
-                       xaaStateChange.c xaaPict.c
+                       xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
+                       xaaOverlayDF.c xaaStateChange.c xaaPict.c
+libxf86xaa_a_LIBADD = libxf86xaaseg.a lsb_first/libxf86xaalsbfirst.a \
+                      lsb_fixed/libxf86xaalsbfixed.a \
+                      msb_first/libxf86xaamsbfirst.a \
+                      msb_fixed/libxf86xaamsbfixed.a
+
+libxf86xaaseg_a_SOURCES = xaaLine.c xaaDashLine.c
+libxf86xaaseg_a_CFLAGS = $(XF86_CFLAGS) -DPOLYSEGMENT
 
 sdk_INCLUDEDIR = $(includedir)/X11/XF86SDK
 sdk_INCLUDES = xaa.h xaalocal.h xaadrop.h