commit 30fe9080e70aa2ebdf1c2bf86e98fe46b1ad27e1 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 6 11:00:32 2012 -0400

Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c --- changes/bug6778 | 4 +++- src/or/include.am | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changes/bug6778 b/changes/bug6778 index 4448d15..9149f70 100644 --- a/changes/bug6778 +++ b/changes/bug6778 @@ -1,4 +1,6 @@ o Minor bugfixes: - Avoid a warning when building common_sha1.i out of tree. Fixes bug 6778; bugfix on 0.2.4.1-alpha. - - Fix a mis-declared dependency on src/common/crypto.c. + - Fix mis-declared dependencies on src/common/crypto.c and + src/or/tor_main.c that could break out-of-tree builds under some + circumstances. Fixes bug 6778; bugfix on 0.2.4.1-alpha. diff --git a/src/or/include.am b/src/or/include.am index 34cd307..97072dc 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -64,7 +64,7 @@ src_or_libtor_a_SOURCES = \ src_or_tor_SOURCES = src/or/tor_main.c AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or

-src/or/tor_main.c: micro-revision.i +src/or/tor_main.o: micro-revision.i

AM_CPPFLAGS += -DSHARE_DATADIR=""$(datadir)"" \ -DLOCALSTATEDIR=""$(localstatedir)"" \