diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:14:17 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:14:17 +0100 |
| commit | 5ad47aafabfdb9718b4beb7c3893af58a9147e2e (patch) | |
| tree | b65c96b62b5e876584afdd31b41c9cd906fcf261 | |
| parent | 2d926d0147af8c632fe389e770c5832009f2ddc0 (diff) | |
| parent | 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605 (diff) | |
| download | tor-5ad47aafabfdb9718b4beb7c3893af58a9147e2e.tar.gz tor-5ad47aafabfdb9718b4beb7c3893af58a9147e2e.zip | |
Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6
| -rw-r--r-- | changes/bug15127 | 3 | ||||
| -rw-r--r-- | src/common/include.am | 1 | ||||
| -rw-r--r-- | src/or/include.am | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug15127 b/changes/bug15127 new file mode 100644 index 0000000000..642dc02bc1 --- /dev/null +++ b/changes/bug15127 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Add missing dependencies to fix compilation on BSD. Patch from + Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha. diff --git a/src/common/include.am b/src/common/include.am index 5b63392541..a642f7a79c 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -146,4 +146,5 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA fi src/common/util_codedigest.o: src/common/common_sha1.i +src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i diff --git a/src/or/include.am b/src/or/include.am index b44e1099dc..e257ceb8cc 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -190,6 +190,7 @@ ORHEADERS = \ noinst_HEADERS+= $(ORHEADERS) micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i +src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i micro-revision.i: FORCE @rm -f micro-revision.tmp; \ |