Remove if's from Makefile.sources

make on win32 complains that:

make[1]: Entering directory `/home/ranma42/Code/fdo/cairo/src'
../src/Makefile.sources:220: *** missing separator.  Stop.

Makefile.sources should not contain if's, which are aoutomake-only
conditionals.  The correct way to conditionally include files is to
enable/disable them using C preprocessor macros.

configure.ac

@@ -114,12 +114,12 @@ CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XCB, no, [
   if test "x$use_xcb" = "xyes" -a "x$use_xlib" = "xyes"; then
     xlib_xcb_REQUIRES="x11-xcb"
     PKG_CHECK_MODULES(xlib_xcb, $xlib_xcb_REQUIRES, ,
-		      [use_xlib_xcb="no (requires $xlib_xcb_REQUIRES http://xcb.freedesktop.org)"])
+		      [AC_MSG_RESULT(no)
+		      use_xlib_xcb="no (requires $xlib_xcb_REQUIRES http://xcb.freedesktop.org)"])
   else
     use_xlib_xcb="no (requires both --enable-xlib and --enable-xcb)"
   fi
 ])
-AM_CONDITIONAL(BUILD_XLIB_XCB, test "x$use_xlib_xcb" = "xyes")
 
 CAIRO_ENABLE_FUNCTIONS(xcb_shm, XCB/SHM, auto, [
   if test "x$use_xcb" = "xyes"; then
@@ -131,7 +131,6 @@ CAIRO_ENABLE_FUNCTIONS(xcb_shm, XCB/SHM, auto, [
     use_xcb_shm="no (requires --enable-xcb)"
   fi
 ])
-AM_CONDITIONAL(BUILD_XCB_SHM, test "x$use_xcb_shm" = "xyes")
 
 dnl ===========================================================================
 

src/Makefile.sources

@@ -212,14 +212,12 @@ cairo_ps_headers = cairo-ps.h
 cairo_ps_private = cairo-ps-surface-private.h
 cairo_ps_sources = cairo-ps-surface.c
 
-cairo_deflate_stream_sources = cairo-deflate-stream.c
+_cairo_deflate_stream_sources = cairo-deflate-stream.c
+cairo_sources += $(_cairo_deflate_stream_sources)
 
 cairo_pdf_headers = cairo-pdf.h
 cairo_pdf_private = cairo-pdf-surface-private.h
 cairo_pdf_sources = cairo-pdf-surface.c
-if CAIRO_HAS_PDF_SURFACE
-req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
-endif
 
 cairo_svg_headers = cairo-svg.h
 cairo_svg_private = cairo-svg-surface-private.h
@@ -251,16 +249,13 @@ cairo_xlib_private = \
 	cairo-xlib-surface-private.h \
 	cairo-xlib-xrender-private.h \
 	$(NULL)
-if BUILD_XLIB_XCB
-cairo_xlib_sources = cairo-xlib-xcb-surface.c
-else
 cairo_xlib_sources = \
 	cairo-xlib-display.c \
 	cairo-xlib-screen.c \
 	cairo-xlib-surface.c \
 	cairo-xlib-visual.c \
+	cairo-xlib-xcb-surface.c \
 	$(NULL)
-endif
 
 cairo_xlib_xrender_headers = cairo-xlib-xrender.h
 
@@ -270,18 +265,14 @@ cairo_xcb_sources = \
 		    cairo-xcb-connection.c \
 		    cairo-xcb-connection-core.c \
 		    cairo-xcb-connection-render.c \
+		    cairo-xcb-connection-shm.c \
 		    cairo-xcb-screen.c \
+		    cairo-xcb-shm.c \
 		    cairo-xcb-surface.c \
 		    cairo-xcb-surface-cairo.c \
 		    cairo-xcb-surface-core.c \
 		    cairo-xcb-surface-render.c \
 		    $(NULL)
-if BUILD_XCB_SHM
-cairo_xcb_sources += \
-		    cairo-xcb-shm.c \
-		    cairo-xcb-connection-shm.c \
-		    $(NULL)
-endif
 
 cairo_qt_headers = cairo-qt.h
 cairo_qt_cxx_sources = cairo-qt-surface.cpp
@@ -379,9 +370,6 @@ cairo_drm_xr_sources = \
 
 cairo_script_headers = cairo-script.h
 cairo_script_sources = cairo-script-surface.c
-if CAIRO_HAS_SCRIPT_SURFACE
-req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
-endif
 
 cairo_tee_headers = cairo-tee.h
 cairo_tee_private = cairo-tee-surface-private.h
@@ -389,13 +377,6 @@ cairo_tee_sources = cairo-tee-surface.c
 
 cairo_xml_headers = cairo-xml.h
 cairo_xml_sources = cairo-xml-surface.c
-if CAIRO_HAS_XML_SURFACE
-req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
-endif
 
 cairo_vg_headers = cairo-vg.h
 cairo_vg_sources = cairo-vg-surface.c
-
-cairo_sources += \
-		 $(req_cairo_deflate_stream_sources) \
-		 $(NULL)

src/cairo-deflate-stream.c

@@ -35,6 +35,9 @@
  */
 
 #include "cairoint.h"
+
+#if CAIRO_HAS_DEFLATE_STREAM
+
 #include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
 #include <zlib.h>
@@ -149,3 +152,5 @@ _cairo_deflate_stream_create (cairo_output_stream_t *output)
 
     return &stream->base;
 }
+
+#endif /* CAIRO_HAS_DEFLATE_STREAM */

src/cairo-xcb-connection-shm.c

@@ -31,6 +31,8 @@
 
 #include "cairoint.h"
 
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
+
 #include "cairo-xcb-private.h"
 
 #include <xcb/xcbext.h>
@@ -107,3 +109,5 @@ _cairo_xcb_connection_shm_detach (cairo_xcb_connection_t *connection,
     xcb_shm_detach (connection->xcb_connection, segment);
     _cairo_xcb_connection_put_xid (connection, segment);
 }
+
+#endif /* CAIRO_HAS_XCB_SHM_FUNCTIONS */

src/cairo-xcb-shm.c

@@ -36,6 +36,8 @@
 
 #include "cairoint.h"
 
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
+
 #include "cairo-xcb-private.h"
 
 #include <xcb/shm.h>
@@ -650,3 +652,5 @@ _cairo_xcb_connection_shm_mem_pools_fini (cairo_xcb_connection_t *connection)
 								 link));
     }
 }
+
+#endif /* CAIRO_HAS_XCB_SHM_FUNCTIONS */

src/cairo-xlib-xcb-surface.c

@@ -38,6 +38,8 @@
 
 #include "cairoint.h"
 
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+
 #include "cairo-xlib.h"
 #include "cairo-xcb.h"
 
@@ -537,3 +539,5 @@ cairo_xlib_surface_get_height (cairo_surface_t *abstract_surface)
 
     return surface->xcb->height;
 }
+
+#endif /* CAIRO_HAS_XLIB_XCB_FUNCTIONS */

src/cairoint.h

@@ -72,6 +72,10 @@
 
 #include "cairo-compiler-private.h"
 
+#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE
+#define CAIRO_HAS_DEFLATE_STREAM 1
+#endif
+
 #if CAIRO_HAS_PS_SURFACE  || \
     CAIRO_HAS_PDF_SURFACE || \
     CAIRO_HAS_SVG_SURFACE || \