From 20396f7dc7980af19879032fe3ec6b881dae37f5 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Thu, 18 Oct 2007 22:16:08 -0700 Subject: [PATCH] Making make check win. --- src/ChangeLog | 3 ++- src/Makefile.am | 3 ++- tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6622308d..acc02901 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,8 @@ 2007-10-18 Micah Cowan * Makefile.am: version.c should not be distributed. Removed - config-post.h. + config-post.h. Add version.c dependency and gnulib include path + for libunittest.a. * sysdep.h: Got contents of config-post.h * config-post.h: Removed. * wget.h: #include "config.h". diff --git a/src/Makefile.am b/src/Makefile.am index f1049efa..709db8ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,7 +56,8 @@ version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am check_LIBRARIES = libunittest.a libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h -libunittest_a_CPPFLAGS = -DTESTING +nodist_libunittest_a_SOURCES = version.c +libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib libunittest_a_LIBADD = $(ALLOCA) $(LIBOBJS) CLEANFILES = *~ *.bak core core.[0-9]* version.c diff --git a/tests/ChangeLog b/tests/ChangeLog index 08175d18..d2084e68 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2007-10-18 Micah Cowan + + * Makefile.am: Add dependency for unit_tests on libgnu.a. + 2007-10-05 Ralf Wildenhues * WgetTest.pm.in: wget is built in the build tree. Use an diff --git a/tests/Makefile.am b/tests/Makefile.am index 45afdfa9..51d3f870 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,6 +98,6 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ check_PROGRAMS = unit-tests unit_tests_SOURCES = -LDADD = ../src/libunittest.a @LIBSSL@ @LIBGNUTLS@ +LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ CLEANFILES = *~ *.bak core core.[0-9]* -- 2.39.2