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

[Behdad Esfahbod]

 boilerplate/Makefile.am |    2 +-
 src/Makefile.am         |    2 +-
 util/Makefile.am        |   13 +++++--------
 3 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 1de35c04e020a203169fda30591733056662abd5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Sep 17 02:10:35 2008 -0400

    Revert "[Makefile.am] Add CAIRO_LIBS to check-link."
    
    This reverts commit a341cb5a98e3eadd5ccb47f9b1e696cb52f7ce9e.
    The change introduced in that commit should not be needed and libtool
    should just do the right thing.  I cannot reproduce the problem
    Chris was having no matter how hard I tried.

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 9d27fd9..22f66a8 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -53,4 +53,4 @@ TESTS += check-link$(EXEEXT)
 endif
 
 check_PROGRAMS += check-link
-check_link_LDADD = libcairoboilerplate.la $(CAIRO_LIBS)
+check_link_LDADD = libcairoboilerplate.la
diff --git a/src/Makefile.am b/src/Makefile.am
index ace6dc3..60a5520 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,7 +77,7 @@ endif
 
 EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c
 check_PROGRAMS += check-link
-check_link_LDADD = libcairo.la $(CAIRO_LIBS)
+check_link_LDADD = libcairo.la
 
 
 # The pre-processed result is used by check-{def,plt}.sh to determine whether
commit 511db7b9a83bdef181cc5d0dbb50103ffb1aeb0e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 16 23:16:21 2008 -0400

    [util/Makefile.am] Cleanup

diff --git a/util/Makefile.am b/util/Makefile.am
index bf6f19c..69c1f38 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/Makefile.am.common
 
-util: malloc-stats.so
+util: malloc-stats.so backtrace-symbols.so
 
 .la.so:
 	$(RM) $@
@@ -8,18 +8,15 @@ util: malloc-stats.so
 
 CLEANFILES += *.so
 
-SOLDFLAGS = -module -avoid-version -export-dynamic -rpath /dev/null
+# The -rpath is needed to build shared objects that are not installed,
+# ie. with EXTRA_LTLIBRARIES
+AM_LDFLAGS = -module -avoid-version -export-dynamic -rpath /dev/null
 
 EXTRA_LTLIBRARIES += malloc-stats.la backtrace-symbols.la
 
-
-backtrace_symbols_la_LDFLAGS = $(SOLDFLAGS)
 backtrace_symbols_la_LIBADD  = -lbfd -liberty
-backtrace_symbols_la_SOURCES = backtrace-symbols.c
 
-malloc_stats_la_LDFLAGS = $(SOLDFLAGS)
-malloc_stats_la_LIBADD  = $(backtrace_symbols_la_LIBADD)
-malloc_stats_la_SOURCES = $(backtrace_symbols_la_SOURCES) malloc-stats.c
+malloc_stats_la_LIBADD  = $(backtrace_symbols_la_LIBADD) backtrace-symbols.lo
 
 EXTRA_DIST += \
 	xr2cairo \