[cairo-commit] boilerplate/Makefile.am src/Makefile.am

[Benjamin Otte]

 boilerplate/Makefile.am |    3 +++
 src/Makefile.am         |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 51b0c21f02a8f0f5d7f44da05e49d7f8f3bf8bc7
Author: Benjamin Otte <otte at redhat.com>
Date:   Fri Jul 16 19:49:53 2010 +0200

    build: Add explicit dependcy to cxx lib
    
    Otherwise the build will fail because it doesn't add the dependency
    manually.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=29114

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 82aa80f..29ad015 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -41,6 +41,9 @@ libcairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libcairo.la \
 	$(CAIRO_LIBS) \
 	$(CAIROBOILERPLATE_LIBS) \
 	$(NULL)
+libcairoboilerplate_la_DEPENDENCIES = \
+	$(cxx_boilerplate_lib) \
+	$(NULL)
 
 if CAIRO_HAS_DL
 libcairoboilerplate_la_LIBADD += -ldl
diff --git a/src/Makefile.am b/src/Makefile.am
index 30a942d..5edf706 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ libcairo_la_SOURCES = \
 libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
 libcairo_la_LIBADD = $(CAIRO_LIBS) \
 	$(cairo_cxx_lib)
-libcairo_la_DEPENDENCIES = $(cairo_def_dependency)
+libcairo_la_DEPENDENCIES = $(cairo_def_dependency) $(cairo_cxx_lib)
 
 # Special headers
 cairoinclude_HEADERS += $(top_srcdir)/cairo-version.h