summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-26 13:43:13 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-26 13:43:13 -0500
commit263f6d11fdbb665b026e3dc2d8e7260475c3ff4b (patch)
tree6293ec9665544b2784724a933ec41308d4505139 /src
parent9a901aaa01eb3c362cc84836b54307b32f44295b (diff)
downloadtor-263f6d11fdbb665b026e3dc2d8e7260475c3ff4b.tar.gz
tor-263f6d11fdbb665b026e3dc2d8e7260475c3ff4b.zip
Mark all object files built based on micro-revision.i as depending on it
Fixes make -j for some users; fixes bug 17826. Bugfix on 0.2.5.1, when we started building testing versions of all the object files.
Diffstat (limited to 'src')
-rw-r--r--src/common/include.am5
-rw-r--r--src/or/include.am5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/common/include.am b/src/common/include.am
index 2fc92e2ceb..d82c093d1e 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -78,7 +78,10 @@ LIBOR_A_SOURCES = \
$(threads_impl_source) \
$(readpassphrase_source)
-src/common/log.o: micro-revision.i
+src/common/src_common_libor_testing_a-log.o \
+ src/common/src_common_libor_testing_a-log.obj \
+ src/common/log.o \
+ src/common/log.obj : micro-revision.i
LIBOR_CRYPTO_A_SOURCES = \
src/common/aes.c \
diff --git a/src/or/include.am b/src/or/include.am
index dab0048b10..14ad05b3e9 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -93,7 +93,10 @@ src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
src_or_tor_SOURCES = src/or/tor_main.c
AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
-src/or/tor_main.o: micro-revision.i
+src/or/tor_main.o \
+ src/or/tor_main.obj \
+ src/or/src_or_tor_cov-tor_main.o \
+ src/or/src_or_tor_cov-tor_main.obj : micro-revision.i
AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \
-DLOCALSTATEDIR="\"$(localstatedir)\"" \