aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-08-03 10:07:57 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-03 10:07:57 -0400
commitb4e2d0607d9697f767c70b24fd225a75ed06371f (patch)
tree7931bf141ff8ea12b7a2022e44864aea84b7067b
parent05fa0a3ef657c9309a51a1d7b4e78b2764f110f6 (diff)
parentddf5020ea8d51292791138ea14f5f369191bcbc9 (diff)
downloadtor-b4e2d0607d9697f767c70b24fd225a75ed06371f.tar
tor-b4e2d0607d9697f767c70b24fd225a75ed06371f.tar.gz
Merge commit 'sebastian/distcheck'
-rw-r--r--doc/Makefile.am2
-rw-r--r--src/or/Makefile.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d976f9d6f..2e70fd747 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -77,5 +77,5 @@ torify.html : torify.html.in
tor-gencert.html : tor-gencert.html.in
tor-resolve.html : tor-resolve.html.in
-CLEANFILES = $(asciidoc_product)
+CLEANFILES = $(asciidoc_product) config.log
DISTCLEANFILES = $(html_in) $(man_in)
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index a95b9eb92..a9ac3cdee 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -82,5 +82,7 @@ or_sha1.i: $(tor_SOURCES)
touch or_sha1.i; \
fi
+CLEANFILES = micro-revision.i
+
#Dummy target to ensure that micro-revision.i _always_ gets built.
FORCE: