From: Micah Cowan <micah@cowan.name>
Date: Tue, 1 Sep 2009 18:00:57 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~274
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=42d953765b5e9bc82d8af862a0a6fd17d6c5f67e;hp=7543c0831d88177c00f5c2f511339f7e4c81dda0

Automated merge.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 683f099f..5b0d571d 100644
--- 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 7cc5fd4c..7d7a2524 100644
--- 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]*