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/

5 files changed, 22 insertions, 27 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index 795c351f3a..0000000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-SUBDIRS = suse
-DIST_SUBDIRS = suse
-
-confdir = $(sysconfdir)/tor
-
-EXTRA_DIST = \
-	cross.sh				\
-	exitlist				\
-	linux-tor-prio.sh			\
-	package_nsis-mingw.sh			\
-	rc.subr					\
-	tor-ctrl.sh				\
-	tor-exit-notice.html			\
-	tor-mingw.nsi.in			\
-	tor-tsocks.conf				\
-	tor.ico					\
-	tor.nsi.in				\
-	tor.sh					\
-	torctl
-
-conf_DATA = tor-tsocks.conf
-
-bin_SCRIPTS = torify
diff --git a/contrib/include.am b/contrib/include.am
new file mode 100644
index 0000000000..4a995a37d2
--- /dev/null
+++ b/contrib/include.am
@@ -0,0 +1,20 @@
+include contrib/suse/include.am
+
+EXTRA_DIST+= \
+	contrib/cross.sh			\
+	contrib/exitlist			\
+	contrib/linux-tor-prio.sh		\
+	contrib/package_nsis-mingw.sh		\
+	contrib/rc.subr				\
+	contrib/tor-ctrl.sh			\
+	contrib/tor-exit-notice.html		\
+	contrib/tor-mingw.nsi.in		\
+	contrib/tor-tsocks.conf			\
+	contrib/tor.ico				\
+	contrib/tor.nsi.in			\
+	contrib/tor.sh				\
+	contrib/torctl
+
+conf_DATA+= contrib/tor-tsocks.conf
+
+bin_SCRIPTS+= contrib/torify
diff --git a/contrib/suse/Makefile.am b/contrib/suse/Makefile.am
deleted file mode 100644
index 06511c0425..0000000000
--- a/contrib/suse/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-confdir = $(sysconfdir)/tor
-
-EXTRA_DIST = tor.sh
diff --git a/contrib/suse/include.am b/contrib/suse/include.am
new file mode 100644
index 0000000000..4aed0e123e
--- /dev/null
+++ b/contrib/suse/include.am
@@ -0,0 +1 @@
+EXTRA_DIST+= contrib/suse/tor.sh
diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl
index 76b6fe5677..9c24134f4c 100755
--- a/contrib/updateVersions.pl
+++ b/contrib/updateVersions.pl
@@ -18,7 +18,7 @@ demand($TOR_NSI);
 open(F, $CONFIGURE_IN) or die "$!";
 $version = undef;
 while (<F>) {
-    if (/AM_INIT_AUTOMAKE\(tor,\s*([^\)]*)\)/) {
+    if (/AC_INIT\(\[tor\],\s*\[([^\]]*)\]\)/) {
 	$version = $1;
 	last;
     }