Magellan Linux

Annotation of /trunk/xorg-server/patches/xorg-server-1.4.99.902-fix-xaa-dependencies-to-build-without-composite-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 622 - (hide annotations) (download)
Thu May 29 23:42:42 2008 UTC (16 years ago) by niro
File size: 1704 byte(s)
-fixed patch

1 niro 622 diff -Naur xorg-server-1.4.99.902/hw/xfree86/xaa/Makefile.am xorg-server-1.4.99.902-magellan/hw/xfree86/xaa/Makefile.am
2     --- xorg-server-1.4.99.902/hw/xfree86/xaa/Makefile.am 2008-04-10 20:58:01.000000000 +0200
3     +++ xorg-server-1.4.99.902-magellan/hw/xfree86/xaa/Makefile.am 2008-05-30 01:47:28.000000000 +0200
4     @@ -9,7 +9,7 @@
5     POLYSEG = s-xaaLine.c s-xaaDashLine.c
6    
7     libxaa_la_LDFLAGS = -avoid-version
8     -libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
9     +libxaa_la_LIBADD =
10    
11     module_LTLIBRARIES = libxaa.la
12     libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
13     diff -Naur xorg-server-1.4.99.902/hw/xfree86/xaa/Makefile.in xorg-server-1.4.99.902-magellan/hw/xfree86/xaa/Makefile.in
14     --- xorg-server-1.4.99.902/hw/xfree86/xaa/Makefile.in 2008-05-21 23:53:04.000000000 +0200
15     +++ xorg-server-1.4.99.902-magellan/hw/xfree86/xaa/Makefile.in 2008-05-30 01:31:16.000000000 +0200
16     @@ -60,7 +60,7 @@
17     am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(sdkdir)"
18     moduleLTLIBRARIES_INSTALL = $(INSTALL)
19     LTLIBRARIES = $(module_LTLIBRARIES)
20     -libxaa_la_DEPENDENCIES = $(top_builddir)/miext/cw/libcw.la
21     +libxaa_la_DEPENDENCIES =
22     am__objects_1 = s-xaaLine.lo s-xaaDashLine.lo
23     am__objects_2 = l-xaaBitmap.lo l-xaaStipple.lo l-xaaTEGlyph.lo
24     am__objects_3 = m-xaaBitmap.lo m-xaaStipple.lo m-xaaTEGlyph.lo
25     @@ -420,7 +420,7 @@
26     MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
27     POLYSEG = s-xaaLine.c s-xaaDashLine.c
28     libxaa_la_LDFLAGS = -avoid-version
29     -libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
30     +libxaa_la_LIBADD =
31     module_LTLIBRARIES = libxaa.la
32     libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
33     xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \