summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-04 15:18:33 +0100
committerNick Mathewson <nickm@torproject.org>2015-03-04 15:18:33 +0100
commitde2c5ad8150a9c111dd8f1dcfed1ceea132578f9 (patch)
tree2ac3c966d95adf7b990e9d067e65657e29ea1e3d
parenta726cd76df0205d573ce0a641b65a89c5f1ce3b4 (diff)
downloadtor-de2c5ad8150a9c111dd8f1dcfed1ceea132578f9.tar.gz
tor-de2c5ad8150a9c111dd8f1dcfed1ceea132578f9.zip
Revert "Missing dependencies; fixes 15127."
This reverts commit 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605.
-rw-r--r--changes/bug151273
-rw-r--r--src/common/include.am1
-rw-r--r--src/or/include.am1
3 files changed, 0 insertions, 5 deletions
diff --git a/changes/bug15127 b/changes/bug15127
deleted file mode 100644
index 642dc02bc1..0000000000
--- a/changes/bug15127
+++ /dev/null
@@ -1,3 +0,0 @@
- 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 a642f7a79c..5b63392541 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -146,5 +146,4 @@ 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 e257ceb8cc..b44e1099dc 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -190,7 +190,6 @@ 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; \