summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-10-28 20:31:15 +0000
committerNick Mathewson <nickm@torproject.org>2004-10-28 20:31:15 +0000
commit5c68db8b3dc74f05ab2bb6e397647f5d4f1dad0e (patch)
tree4dd4f2e91328cc66161c57366b3cbbbafe2ebd67
parentf0cb6baba16d6054968174c48580ddd1a542524d (diff)
downloadtor-5c68db8b3dc74f05ab2bb6e397647f5d4f1dad0e.tar.gz
tor-5c68db8b3dc74f05ab2bb6e397647f5d4f1dad0e.zip
Link tools directory into rest of build system
svn:r2623
-rw-r--r--configure.in3
-rw-r--r--src/Makefile.am4
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index e7314e6df9..209eeee660 100644
--- a/configure.in
+++ b/configure.in
@@ -235,5 +235,4 @@ AC_SUBST(LOCALSTATEDIR)
echo "confdir: $CONFDIR"
-AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile)
-
+AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index d9ca7a375b..ae647b2d61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
# leave in dependency order, since common must be built first
-SUBDIRS = common or win32 config
-DIST_SUBDIRS = common or win32 config
+SUBDIRS = common or tools win32 config
+DIST_SUBDIRS = common or tools win32 config