Commit e30a5074 authored by Chris Wilson's avatar Chris Wilson 🤔
Browse files

[Makefile] Hide cpp files from automake

Prevent automake from including a CPP file with the SOURCE as that breaks
linking.
parent e13586b6
......@@ -13,8 +13,9 @@ libcairoboilerplate_la_SOURCES = \
libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
if CAIRO_HAS_BEOS_SURFACE
libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
# comment out the cpp files otherwise automake thinks we need g++
#libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
#libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
# BeOS system headers trigger this warning
libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
endif
......
......@@ -444,9 +444,8 @@ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, beos, BEOS_SURFACE, no, [
esac
])
if test "x$use_beos" = "xyes"; then
AC_PROG_CXX
fi
dnl We need g++ to compile the Beos backend
AC_PROG_CXX
dnl ===========================================================================
......
......@@ -230,8 +230,9 @@ cairo_sources += $(os2_sources)
backend_pkgconfigs += cairo-os2.pc
endif
beos_headers = cairo-beos.h
beos_sources = cairo-beos-surface.cpp
# comment out the cpp files otherwise automake thinks we need g++
#beos_headers = cairo-beos.h
#beos_sources = cairo-beos-surface.cpp
cairo_all_sources += $(beos_headers) $(beos_sources)
if CAIRO_HAS_BEOS_SURFACE
cairo_headers += $(beos_headers)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment