Make distcheck happy.

diff --git a/ChangeLog b/ChangeLog
index e7b0060bc78abd9649cc72fee196ad05773b921c..8358b3bda9f97163aa77845768ddbec09fff4ac3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-14  Micah Cowan  <micah@cowan.name>
+
+       * po/Makefile.in.in (distclean): remove en_US.po, too.
+
+       * Makefile.am: Include md5 as a subdir unconditionally. 
+       It may result in useless compilation, and additional risk of
+       breaking a build of something that isn't actually needed, but
+       otherwise it's too much of a hassle to manage a failure-free
+       distcheck.
+
 2009-06-12  Micah Cowan  <micah@cowan.name>
 
        * configure.ac: Check for h_errno declaration. Idea thanks to

diff --git a/Makefile.am b/Makefile.am
index 4bff177ad82ec23cea5b9e5b90c31a1e624e9583..d5b415c7eaa1b5d6e730dbf7357e698fa0ea0489 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,10 @@
 ACLOCAL_AMFLAGS = -I m4 -I md5/m4
 
 # subdirectories in the distribution
-SUBDIRS = lib @MD5_SUBDIR@ src doc po tests util windows
+SUBDIRS = lib md5 src doc po tests util windows
 
 EXTRA_DIST = ChangeLog.README configure.bat MAILING-LIST \
-            msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
-            msdos/Makefile.WC ABOUT-NLS autogen.sh
+             msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+             msdos/Makefile.WC ABOUT-NLS autogen.sh
 
 CLEANFILES = *~ *.bak $(DISTNAME).tar.gz

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 06b05fe185c9b5f8386db3f6b4ac585fd2a0c3ba..094055621378ce700f4768d75193cd7e16c5148f 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-14  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am (wget.pod): $(srcdir)/version.texi -> version.texi
+
 2009-06-12  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Download Options): More accuracy on what happens when

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 74abe7f6582155cdb91d35404c3f956042e7001d..46c77d9ed0f4776f417b5cf40503ddd879d13e0d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST = sample.wgetrc \
             $(SAMPLERCTEXI) \
             texi2pod.pl
 
-wget.pod: $(srcdir)/wget.texi $(srcdir)/version.texi
+wget.pod: $(srcdir)/wget.texi version.texi
        $(TEXI2POD) $(srcdir)/wget.texi $@
 
 $(MAN): wget.pod

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index e6da10aa44808e1ac57b219d0f42f41d628480ac..27cbb1bf886c826b4a67abaaec8c461201f35196 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -312,7 +312,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
-       rm -f Makefile Makefile.in POTFILES *.mo
+       rm -f Makefile Makefile.in POTFILES *.mo en_US.po
 
 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"

diff --git a/src/ChangeLog b/src/ChangeLog
index dbbc2c0e4820e817321b606a36331550023bc0ba..2bc9a8ab06d6fecb5edde33dff393ca2c9c66cda 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-14  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am (wget_SOURCES): css-tokens.h needs to ship with
+       dist, too.
+
 2009-06-13  Micah Cowan  <micah@cowan.name>
 
        * init.c: Rename setval_internal_wrapper to setval_internal_tilde,

diff --git a/src/Makefile.am b/src/Makefile.am
index 16e4bcb0d87c4da64f55eaff7cc817942485583f..1ced6a90a491fe00b9928c0945e2abc072c12507 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ @LIBS@
 
 bin_PROGRAMS = wget
 wget_SOURCES = build_info.c cmpt.c connect.c convert.c cookies.c ftp.c    \
-              css.l css-url.c \
+              css.l css-url.c css-tokens.h \
               ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
               http.c init.c log.c main.c netrc.c progress.c ptimer.c     \
               recur.c res.c retr.c snprintf.c spider.c url.c             \

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2d0dc39239dd454b045c5b62575e23e72524893c..522bd2020c1b57fbaef690882cbe3e1105562827 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-14  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am (EXTRA_DIST): Include all the tests, run-px, and
+       certs/, to make distcheck happy.
+
 2009-06-11  Benjamin Wolsey <bwy@benjaminwolsey.de>
 
        * Test-proxied-https-auth.px: Take an optional argument for the

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa8dd53ce5c9e1ca0159894a443cc1b9e72c8c2b..82c31360696953678e12446bb193f0a74f0133fa 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,16 +58,49 @@ 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 \
-            Test-c.px Test-E-k-K.px Test-E-k.px Test-ftp.px \
-            Test-HTTP-Content-Disposition-1.px \
-            Test-HTTP-Content-Disposition-2.px \
-            Test-HTTP-Content-Disposition.px \
-            Test-N-current.px Test-N-old.px Test-nonexisting-quiet.px \
-            Test-noop.px Test-np.px Test-N.px \
-            Test-O-nonexisting.px Test-O.px \
-            Test-Restrict-Lowercase.px Test-Restrict-Uppercase.px \
-            Test--spider-fail.px Test--spider.px Test--spider-r.px
+             Test-auth-basic.px \
+             Test-auth-no-challenge.px \
+             Test-auth-no-challenge-url.px \
+             Test-c-full.px \
+             Test-c-partial.px \
+             Test-c.px \
+             Test-c-shorter.px \
+             Test-E-k-K.px \
+             Test-E-k.px \
+             Test-ftp.px \
+             Test-HTTP-Content-Disposition-1.px \
+             Test-HTTP-Content-Disposition-2.px \
+             Test-HTTP-Content-Disposition.px \
+             Test-N-current.px \
+             Test-N-HTTP-Content-Disposition.px \
+             Test-N--no-content-disposition.px \
+             Test-N--no-content-disposition-trivial.px \
+             Test-N-no-info.px \
+             Test--no-content-disposition.px \
+             Test--no-content-disposition-trivial.px \
+             Test-N-old.px \
+             Test-nonexisting-quiet.px \
+             Test-noop.px \
+             Test-np.px \
+             Test-N.px \
+             Test-N-smaller.px \
+             Test-O-HTTP-Content-Disposition.px \
+             Test-O-nc.px \
+             Test-O--no-content-disposition.px \
+             Test-O--no-content-disposition-trivial.px \
+             Test-O-nonexisting.px \
+             Test-O.px \
+             Test-proxied-https-auth.px \
+             Test-proxy-auth-basic.px \
+             Test-Restrict-Lowercase.px \
+             Test-Restrict-Uppercase.px \
+             Test--spider-fail.px \
+             Test--spider.px \
+             Test--spider-r-HTTP-Content-Disposition.px \
+             Test--spider-r--no-content-disposition.px \
+             Test--spider-r--no-content-disposition-trivial.px \
+             Test--spider-r.px \
+             run-px certs
 
 check_PROGRAMS = unit-tests
 unit_tests_SOURCES =