[cairo-commit] test/Makefile.am

[Behdad Esfahbod]

 test/Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

New commits:
diff-tree 7421e8af0ca3b5c80dd3c7b145c639196f6036a5 (from 7e9aad228971a81783e09edfef58c5165a3c932e)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Oct 25 15:28:36 2006 -0400

    [test] Make sure tests are not relinked unnecessarily
    
    What was causing it was making all tests depend on all, to make sure
    ../boilerplate is built first.  I'm not making all tests depend on
    ../boilerplate/libcairoboilerplate.la and ../src/libcairo.ls and added rules
    to build those (by changing dir and making them).

diff --git a/test/Makefile.am b/test/Makefile.am
index 304eca7..846b606 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,3 @@
-SUBDIRS=../boilerplate
-DIST_SUBDIRS =
-
 # Here are all the tests that are run unconditionally
 TESTS = 			\
 a8-mask				\
@@ -402,6 +399,12 @@ LDADD = libcairotest.la \
         $(top_builddir)/boilerplate/libcairoboilerplate.la \
 	$(top_builddir)/src/libcairo.la
 
+$(top_builddir)/boilerplate/libcairoboilerplate.la:
+	cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la
+
+$(top_builddir)/src/libcairo.la:
+	cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libcairo.la
+
 if HAVE_PTHREAD
 LDADD += -lpthread
 endif
@@ -484,7 +487,7 @@ html:
 rehtml:
 	@$(MAKE) $(AM_MAKEFLAGS) TESTS="$(FAILED_TESTS)" html
 
-$(TESTS): all $(SUPPORT_PROGS)
+$(TESTS): $(SUPPORT_PROGS)
 
 %.log: %
 	-./$<