Automated merge.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 683f099f322234ef42c10c53cd783331d2b5607a..5b0d571d6deaf62a599ef1cf2a48d67f5b3632a5 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-01  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am (../src/libunittest.a): Make it a phony target,
+       so we always make sure to get up-to-date unit-test runs.
+
 2009-09-01  Steven Schubiger  <stsc@member.fsf.org>
 
        * Makefile.am: Add Test-cookies.px, Test-cookies-401.px

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7cc5fd4c8e58218d500fe9529d4a138ce3bbd716..7d7a25245a00f81bbc3a8fadd11397113cff0424 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,6 +42,8 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests
 ../src/wget$(EXEEXT):
        cd ../src && $(MAKE) $(AM_MAKEFLAGS)
 
+# Make libunittest "PHONY" so we're always sure we're up-to-date.
+.PHONY: ../src/libunittest.a
 ../src/libunittest.a:
        cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a
 
@@ -51,7 +53,7 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests
 ../md5/libmd5.a:
        cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
 
-run-unit-tests: unit-tests$(EXEEXT)
+run-unit-tests: unit-tests$(EXEEXT) ../src/libunittest.a
        ./unit-tests$(EXEEXT)
 
 run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
@@ -121,9 +123,9 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
              run-px certs
 
 check_PROGRAMS = unit-tests
-unit_tests_SOURCES = 
-#unit-tests: ../src/libunittest.a ../lib/libgnu.a
+unit_tests_SOURCES =
+unit-tests: ../src/libunittest.a
 LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
-        @MD5_LDADD@
+    @MD5_LDADD@
 
 CLEANFILES = *~ *.bak core core.[0-9]*