diff options
| author | Stewart Smith <stewart@flamingspork.com> | 2012-08-02 23:31:43 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-09 11:03:47 -0400 |
| commit | 2a4a1496241d6c4183763f90600be4775ccb5470 (patch) | |
| tree | 99ec92b85e229d4e8aee6b90a0f1aede1dad180a /configure.in | |
| parent | ca90aea5ebde66565fbb6fb5d0e88a970d3563a5 (diff) | |
| download | tor-2a4a1496241d6c4183763f90600be4775ccb5470.tar.gz tor-2a4a1496241d6c4183763f90600be4775ccb5470.zip | |
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/
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/configure.in b/configure.in index c107148e79..7b7d5fbb0c 100644 --- a/configure.in +++ b/configure.in @@ -3,8 +3,9 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.4.0-alpha-dev) +AC_INIT([tor],[0.2.4.0-alpha-dev]) +AC_CONFIG_SRCDIR([src/or/main.c]) +AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_CONFIG_HEADER(orconfig.h) @@ -1324,16 +1325,7 @@ AC_CONFIG_FILES([ contrib/tor.sh contrib/torctl contrib/torify - doc/Makefile - src/Makefile - src/common/Makefile - src/config/Makefile src/config/torrc.sample - src/or/Makefile - src/test/Makefile - src/tools/Makefile - src/tools/tor-fw-helper/Makefile - src/win32/Makefile tor.spec ]) |