diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:52:09 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:52:09 -0800 |
| commit | 77bc95cb5ea7539e51b0c5bc2db8684edcdbd85b (patch) | |
| tree | 2926c5c81bc61ff80f4d753c590e6e399043e7ee /src | |
| parent | 55232e32c73b114dbe8de643ff0f352e252457ac (diff) | |
| parent | 263f6d11fdbb665b026e3dc2d8e7260475c3ff4b (diff) | |
| download | tor-77bc95cb5ea7539e51b0c5bc2db8684edcdbd85b.tar.gz tor-77bc95cb5ea7539e51b0c5bc2db8684edcdbd85b.zip | |
Merge remote-tracking branch 'public/17826_redux'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/include.am | 5 | ||||
| -rw-r--r-- | src/or/include.am | 5 |
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)\"" \ |