Move to non-recursive make

This gives us a few benefits:
1) make -j clean all
   this will start working, as it should. It currently doesn't.
2) increased parallel build
   recursive make will max out at number of files in a directory,
   non-recursive make doesn't have such a limitation
3) Removal of duplicate information in make files,
   less error prone

I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way
that was used was not only deprecated but will be *removed* in the next
major automake release (1.13).... so probably best that we can continue
to bulid tor without requiring old automake.
(see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html )

For more reasons  why, see resources such as:
http://miller.emu.id.au/pmiller/books/rmch/

1 files changed, 160 insertions, 0 deletions

diff --git a/src/or/include.am b/src/or/include.am
new file mode 100644
index 0000000000..3afc9bbce5
--- /dev/null
+++ b/src/or/include.am
@@ -0,0 +1,160 @@
+bin_PROGRAMS+= src/or/tor
+noinst_LIBRARIES+= src/or/libtor.a
+
+if BUILD_NT_SERVICES
+tor_platform_source=src/or/ntmain.c
+else
+tor_platform_source=
+endif
+
+EXTRA_DIST+= src/or/ntmain.c src/or/or_sha1.i src/or/Makefile.nmake
+
+if USE_EXTERNAL_EVDNS
+evdns_source=
+else
+evdns_source=src/or/eventdns.c
+endif
+
+src_or_libtor_a_SOURCES = \
+	src/or/buffers.c				\
+	src/or/circuitbuild.c				\
+	src/or/circuitlist.c				\
+	src/or/circuituse.c				\
+	src/or/command.c				\
+	src/or/config.c				\
+	src/or/connection.c				\
+	src/or/connection_edge.c			\
+	src/or/connection_or.c				\
+	src/or/control.c				\
+	src/or/cpuworker.c				\
+	src/or/directory.c				\
+	src/or/dirserv.c				\
+	src/or/dirvote.c				\
+	src/or/dns.c					\
+	src/or/dnsserv.c				\
+	src/or/geoip.c					\
+	src/or/hibernate.c				\
+	src/or/main.c					\
+	src/or/microdesc.c				\
+	src/or/networkstatus.c				\
+	src/or/nodelist.c				\
+	src/or/onion.c					\
+	src/or/transports.c				\
+	src/or/policies.c				\
+	src/or/reasons.c				\
+	src/or/relay.c					\
+	src/or/rendclient.c				\
+	src/or/rendcommon.c				\
+	src/or/rendmid.c				\
+	src/or/rendservice.c				\
+	src/or/rephist.c				\
+	src/or/replaycache.c				\
+	src/or/router.c					\
+	src/or/routerlist.c				\
+	src/or/routerparse.c				\
+	src/or/status.c					\
+	$(evdns_source)					\
+	$(tor_platform_source)				\
+	src/or/config_codedigest.c			
+
+#libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \
+#	../common/libor-event.a
+
+
+src_or_tor_SOURCES = src/or/tor_main.c
+src_or_tor_INCLUDES= -Isrc/or/
+
+src/or/tor_main.c: src/or/micro-revision.i
+
+AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
+        -DLOCALSTATEDIR="\"$(localstatedir)\"" \
+        -DBINDIR="\"$(bindir)\""
+
+# -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
+# This seems to matter nowhere but on windows, but I assure you that it
+# matters a lot there, and is quite hard to debug if you forget to do it.
+
+
+src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
+src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypto.a \
+	src/common/libor-event.a \
+	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+	@TOR_LIB_WS32@ @TOR_LIB_GDI@
+
+noinst_HEADERS+= \
+	src/or/buffers.h				\
+	src/or/circuitbuild.h				\
+	src/or/circuitlist.h				\
+	src/or/circuituse.h				\
+	src/or/command.h				\
+	src/or/config.h					\
+	src/or/connection.h				\
+	src/or/connection_edge.h			\
+	src/or/connection_or.h				\
+	src/or/control.h				\
+	src/or/cpuworker.h				\
+	src/or/directory.h				\
+	src/or/dirserv.h				\
+	src/or/dirvote.h				\
+	src/or/dns.h					\
+	src/or/dnsserv.h				\
+	src/or/eventdns.h				\
+	src/or/eventdns_tor.h				\
+	src/or/geoip.h					\
+	src/or/hibernate.h				\
+	src/or/main.h					\
+	src/or/microdesc.h				\
+	src/or/networkstatus.h				\
+	src/or/nodelist.h				\
+	src/or/ntmain.h					\
+	src/or/onion.h					\
+	src/or/or.h					\
+	src/or/transports.h				\
+	src/or/policies.h				\
+	src/or/reasons.h				\
+	src/or/relay.h					\
+	src/or/rendclient.h				\
+	src/or/rendcommon.h				\
+	src/or/rendmid.h				\
+	src/or/rendservice.h				\
+	src/or/rephist.h				\
+	src/or/replaycache.h				\
+	src/or/router.h					\
+	src/or/routerlist.h				\
+	src/or/routerparse.h				\
+	src/or/status.h					\
+	src/or/micro-revision.i			
+
+src_or_config_codedigest.o: src/or/or_sha1.i
+
+src/or/micro-revision.i: FORCE
+	@rm -f src/or/micro-revision.tmp;				\
+	if test -d "$(top_srcdir)/.git" &&				\
+	  test -x "`which git 2>&1;true`"; then				\
+	  HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`";	\
+	  echo \"$$HASH\" > src/or/micro-revision.tmp; 			\
+        fi;								\
+	if test ! -f src/or/micro-revision.tmp ; then			\
+	  if test ! -f src/or/micro-revision.i ; then			\
+	    echo '""' > src/or/micro-revision.i;			\
+	  fi;								\
+	elif test ! -f src/or/micro-revision.i ||			\
+	  test x"`cat src/or/micro-revision.tmp`" != x"`cat src/or/micro-revision.i`"; then \
+	  mv src/or/micro-revision.tmp src/or/micro-revision.i;		\
+	fi; true
+
+src_or_or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)
+	if test "@SHA1SUM@" != none; then \
+	  (cd "$(srcdir)" && "@SHA1SUM@" $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)) | \
+	  "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > src/or/or_sha1.i; \
+	elif test "@OPENSSL@" != none; then \
+	  (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)) | \
+	  "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > src/or/or_sha1.i; \
+	else \
+	  rm src/or/or_sha1.i; \
+	  touch src/or/or_sha1.i; \
+	fi
+
+CLEANFILES+= src/or/micro-revision.i
+
+FORCE:
\ No newline at end of file