X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=tests%2FMakefile.am;h=aa8dd53ce5c9e1ca0159894a443cc1b9e72c8c2b;hb=30385d6c5dfc341fdce111392dbc55e5cdb9202a;hp=27f9adaa01ba761f616bc4a184a7282c969bb52d;hpb=3f1360357aa8bbd709d22b1042470ba66f3f09a7;p=wget

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27f9adaa..aa8dd53c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for `wget' utility
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,11 +42,20 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests
 ../src/wget$(EXEEXT):
 	cd ../src && $(MAKE) $(AM_MAKEFLAGS)
 
+../src/libunittest.a:
+	cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a
+
+../lib/libgnu.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
+../md5/libmd5.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
 run-unit-tests: unit-tests$(EXEEXT)
 	./unit-tests$(EXEEXT)
 
-run-px-tests: WgetTest.pm
-	./run-px $(top_srcdir)
+run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
+	$(srcdir)/run-px $(top_srcdir)
 
 EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
 	     Test-auth-basic.px Test-c-full.px Test-c-partial.px \
@@ -62,6 +71,7 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
 
 check_PROGRAMS = unit-tests
 unit_tests_SOURCES = 
+#unit-tests: ../src/libunittest.a ../lib/libgnu.a
 LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
         @MD5_LDADD@