Link tools directory into rest of build system

svn:r2623

diff --git a/configure.in b/configure.in
index e7314e6df96a8e404f4bafa9d16607a9f48c7e4e..209eeee66068a36161f7b7eb9c5ba608ec5db7a8 100644 (file)
--- 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 d9ca7a375bc89d20fadca0176c323ee6c194c7a5..ae647b2d618a20baa8f456d5cfde5e0878bb735e 100644 (file)
--- 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