xserver/hw/xizzle/xaa Makefile.am,3.5,3.6

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/xaa
In directory pdx:/tmp/cvs-serv11378

Modified Files:
	Makefile.am 
Log Message:
I feel so dirty. Shunt out {l,m}sb_fi{rst,xed} subdirs in favour of
generated C files in the directory; ditto libxaadashseg.a, or whatever
it was called.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/xaa/Makefile.am,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/Makefile.am	10 Mar 2004 11:50:35 -0000	3.5
+++ b/Makefile.am	14 Mar 2004 13:52:54 -0000	3.6
@@ -1,9 +1,17 @@
 INCLUDES = $(XIZZLE_INCS)
 AM_CFLAGS = $(XIZZLE_CFLAGS)
 
-SUBDIRS = lsb_first msb_first lsb_fixed msb_fixed
+LSB_FIRST = l-xaaBitmap.c l3-xaaBitmap.c l-xaaStipple.c l3-xaaStipple.c \
+            l-xaaTEGlyph.c
+MSB_FIRST = m-xaaBitmap.c m3-xaaBitmap.c m-xaaStipple.c m3-xaaStipple.c \
+            m-xaaTEGlyph.c
+LSB_FIXED = lf-xaaBitmap.c lf3-xaaBitmap.c lf-xaaStipple.c lf3-xaaStipple.c \
+            lf-xaaTEGlyph.c
+MSB_FIXED = mf-xaaBitmap.c mf3-xaaBitmap.c mf-xaaStipple.c mf3-xaaStipple.c \
+            mf-xaaTEGlyph.c
+POLYSEG = s-xaaLine.c s-xaaDashLine.c
 
-lib_LIBRARIES = libxizzlexaa.a libxizzlexaaseg.a
+lib_LIBRARIES = libxizzlexaa.a
 libxizzlexaa_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 \
@@ -11,14 +19,45 @@
                        xaaPaintWin.c xaaRect.c xaaLineMisc.c xaaBitOrder.c \
                        xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
                        xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
-                       xaaOverlayDF.c xaaStateChange.c xaaPict.c
-libxizzlexaa_a_LIBADD = libxizzlexaaseg.a lsb_first/libxizzlexaalsbfirst.a \
-                      lsb_fixed/libxizzlexaalsbfixed.a \
-                      msb_first/libxizzlexaamsbfirst.a \
-                      msb_fixed/libxizzlexaamsbfixed.a
+                       xaaOverlayDF.c xaaStateChange.c xaaPict.c $(POLYSEG) \
+                       $(LSB_FIRST) $(MSB_FIRST) $(LSB_FIXED) $(MSB_FIXED)
+s-%.c:
+	echo "#define POLYSEGMENT" > $@
+	echo '#include "$*.c"' >> $@
+l-%.c:
+	echo "#define LSBFIRST" > $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+l3-%.c:
+	echo "#define LSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+lf-%.c:
+	echo "#define LSBFIRST" > $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+lf3-%.c:
+	echo "#define LSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+m-%.c:
+	echo "#define MSBFIRST" > $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+m3-%.c:
+	echo "#define MSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+mf-%.c:
+	echo "#define MSBFIRST" > $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+mf3-%.c:
+	echo "#define MSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
 
-libxizzlexaaseg_a_SOURCES = xaaLine.c xaaDashLine.c
-libxizzlexaaseg_a_CFLAGS = $(XIZZLE_CFLAGS) -DPOLYSEGMENT
+DISTCLEANFILES = $(POLYSEG) $(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED)
 
 sdk_INCLUDEDIR = $(includedir)/xizzle
 sdk_INCLUDES = xaa.h xaalocal.h xaadrop.h