Link tools directory into rest of build system

svn:r2623

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)

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