summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2008-09-17 02:10:35 -0400
committerBehdad Esfahbod <behdad@behdad.org>2008-09-17 02:11:38 -0400
commit1de35c04e020a203169fda30591733056662abd5 (patch)
tree124d8888656efd9509c2a081d4f118ca586479bc
parent511db7b9a83bdef181cc5d0dbb50103ffb1aeb0e (diff)
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.
-rw-r--r--boilerplate/Makefile.am2
-rw-r--r--src/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 9d27fd96d..22f66a89d 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 ace6dc312..60a552076 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