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 /contrib/Makefile.am | |
| 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 'contrib/Makefile.am')
| -rw-r--r-- | contrib/Makefile.am | 23 |
1 files changed, 0 insertions, 23 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 |