[cairo-commit] 2 commits - src/Makefile.am

[Benjamin Otte]

 src/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0bd704bd1e92b274209aeda6de88c7e75ffa81be
Author: Benjamin Otte <otte at redhat.com>
Date:   Fri Jul 9 17:15:02 2010 +0200

    build: Remove wrong flags from libcairo_cxx.la
    
    They're useful for the final so, but not for an intermediate noinst lib.

diff --git a/src/Makefile.am b/src/Makefile.am
index 01ab896..357e217 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ libcairo_cxx_la_SOURCES = \
 	$(enabled_cairo_private) \
 	$(enabled_cairo_cxx_sources) \
 	$(NULL)
-libcairo_cxx_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
+libcairo_cxx_la_LDFLAGS = $(AM_LDFLAGS) $(export_symbols)
 libcairo_cxx_la_LIBADD = $(CAIRO_LIBS)
 libcairo_cxx_la_DEPENDENCIES = $(cairo_def_dependency)
 
commit faceffd5beb4297299175945660522d8f1f5f2cb
Author: Benjamin Otte <otte at redhat.com>
Date:   Fri Jul 9 16:58:18 2010 +0200

    build: copy/paste failure: Don't build libcxx.la

diff --git a/src/Makefile.am b/src/Makefile.am
index b934498..01ab896 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ lib_LTLIBRARIES = libcairo.la
 if BUILD_CXX
 cairo_cxx_lib = libcairo_cxx.la
 else
-cairo_cxx_lib = libcairo_cxx.la
+cairo_cxx_lib =
 endif
 
 noinst_LTLIBRARIES = $(cairo_cxx_lib)