Revert "Missing dependencies; fixes 15127."

This reverts commit 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605.

diff --git a/changes/bug15127 b/changes/bug15127
deleted file mode 100644 (file)
index 642dc02..0000000
--- 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 a642f7a79cc0bc7f01dc3e05e26e6aa41f016a02..5b63392541573378ae70b80aded24e967bc1eb90 100644 (file)
--- 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 e257ceb8cce877556f278e75dfcc022369a11a42..b44e1099dcf4cc8753e5f54e093222da35c7c99a 100644 (file)
--- 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;                              \