[cairo-commit] src/Makefile.am

[Behdad Esfahbod]

 src/Makefile.am |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit cafdd0161941413547d253c743c743323e790400
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 15 13:33:50 2008 -0400

    [Makefile.am] Document why beos was removed from build, and remove some cruft

diff --git a/src/Makefile.am b/src/Makefile.am
index c933252..44b8e14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -236,12 +236,10 @@ beos_sources = cairo-beos-surface.cpp
 cairo_all_sources += $(beos_headers) $(beos_sources)
 if CAIRO_HAS_BEOS_SURFACE
 cairo_headers += $(beos_headers)
+# automake is stupid enough to always use c++ linker if we enable the
+# following line, even if beos surface is not enabled.  Disable it for now.
+#cairo_sources += $(beos_sources)
 backend_pkgconfigs += cairo-beos.pc
-
-noinst_LTLIBRARIES = libcairo_beos.la
-libcairo_beos_la_SOURCES = $(libcairo_beos_sources)
-# BeOS system headers trigger this warning
-libcairo_beos_la_CXXFLAGS = -Wno-multichar
 endif
 
 glitz_headers = cairo-glitz.h