[xserver-commit] xfree86/xaa/msb_fixed Makefile.am,1.1,1.2

[Daniel Stone]

Committed by: daniel

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

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/msb_fixed/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/Makefile.am	19 Feb 2004 03:50:06 -0000	1.1
+++ b/Makefile.am	3 Mar 2004 12:23:59 -0000	1.2
@@ -1,9 +1,13 @@
 INCLUDES = $(XF86_INCS)
-AM_CFLAGS = $(XF86_CFLAGS) -DMSBFIRST -DFIXEDBASE
+LOCAL_CFLAGS = $(XF86_CFLAGS) -DMSBFIRST -DFIXEDBASE
 
 lib_LIBRARIES = libxf86xaam1.a libxf86xaam3.a libxf86xaamsbfixed.a
 libxf86xaam3_a_SOURCES = $(srcdir)/../xaaBitmap.c $(srcdir)/../xaaStipple.c
-libxf86xaam3_a_CFLAGS = $(AM_CFLAGS) -DTRIPLE_BITS
+libxf86xaam3_a_CFLAGS = $(LOCAL_CFLAGS) -DTRIPLE_BITS
 libxf86xaam1_a_SOURCES = $(srcdir)/../xaaBitmap.c $(srcdir)/../xaaStipple.c \
-                          $(srcdir)/../xaaTEGlyph.c
-libxf86xaamsbfixed_a_SOURCES = libxf86xaam1.a libxf86xaam3.a
+                         $(srcdir)/../xaaTEGlyph.c
+libxf86xaam1_a_CFLAGS = $(LOCAL_CFLAGS)
+libxf86xaamsbfixed_a_SOURCES = dummy.c
+libxf86xaamsbfixed_a_LIBADD = libxf86xaam1.a libxf86xaam3.a
+dummy.c:
+	touch $@