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 /src/config | |
| parent | ca90aea5ebde66565fbb6fb5d0e88a970d3563a5 (diff) | |
| download | tor-2a4a1496241d6c4183763f90600be4775ccb5470.tar tor-2a4a1496241d6c4183763f90600be4775ccb5470.tar.gz | |
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 'src/config')
| -rw-r--r-- | src/config/Makefile.am | 16 | ||||
| -rw-r--r-- | src/config/include.am | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am deleted file mode 100644 index 90dd218b4..000000000 --- a/src/config/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -confdir = $(sysconfdir)/tor - -tordatadir = $(datadir)/tor - -EXTRA_DIST = geoip -# fallback-consensus - -conf_DATA = torrc.sample - -tordata_DATA = geoip -# fallback_consensus - -# If we don't have it, fake it. -fallback-consensus: - touch fallback-consensus - diff --git a/src/config/include.am b/src/config/include.am new file mode 100644 index 000000000..e6e1fe044 --- /dev/null +++ b/src/config/include.am @@ -0,0 +1,16 @@ +confdir = $(sysconfdir)/tor + +tordatadir = $(datadir)/tor + +EXTRA_DIST+= src/config/geoip +# fallback-consensus + +conf_DATA = src/config/torrc.sample + +tordata_DATA = src/config/geoip +# fallback_consensus + +# If we don't have it, fake it. +src_config_fallback-consensus: + touch src/config/fallback-consensus + |