diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2008-12-05 15:18:48 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2008-12-05 15:18:48 +0000 |
| commit | e30a50746d1c14e3d23d52988a8e98f22cb3cd0b (patch) | |
| tree | 491a9801544e89b2e3106df229de66be070c28be | |
| parent | e13586b6b78d3636c3e00b437fdb4f3ac449b185 (diff) | |
[Makefile] Hide cpp files from automake1.6
Prevent automake from including a CPP file with the SOURCE as that breaks
linking.
| -rw-r--r-- | boilerplate/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am index fdf46fae..8880b4bc 100644 --- a/boilerplate/Makefile.am +++ b/boilerplate/Makefile.am @@ -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 diff --git a/configure.in b/configure.in index f67fc5c7..28e9c28c 100644 --- a/configure.in +++ b/configure.in @@ -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 =========================================================================== diff --git a/src/Makefile.am b/src/Makefile.am index e56485c9..3cea0b36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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) |