diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2016-02-26 12:53:28 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-11 10:08:53 -0500 |
| commit | 25fa21802f578db0e2852084a95a23b60ef1d1e9 (patch) | |
| tree | 1bef9565ae8d1b59649d6ac503998ac518fdc27f | |
| parent | ef31c8862f4ed86cfa4987b2ec58468269457f87 (diff) | |
| download | tor-25fa21802f578db0e2852084a95a23b60ef1d1e9.tar.gz tor-25fa21802f578db0e2852084a95a23b60ef1d1e9.zip | |
Move Automake options to configure.ac
This will centralize the version configuration in one file to simplify
future changes.
Also fixes some typos in the Automake options comments.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index bae506ab0f..92ba2b868d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,6 @@ # Copyright (c) 2007-2015, The Tor Project, Inc. # See LICENSE for licensing information -# "foreign" means we don't follow GNU package layout standards -# 1.11 means we require automake vesion 1.11 -# "subdir-objects" means put .o files in the same directory as the .c files -AUTOMAKE_OPTIONS = foreign 1.11 subdir-objects - ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES= diff --git a/configure.ac b/configure.ac index a4581e54c3..df4b9cdc08 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,12 @@ AC_PREREQ([2.63]) AC_INIT([tor],[0.2.8.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE + +# "foreign" means we don't follow GNU package layout standards +# "1.11" means we require automake version 1.11 or newer +# "subdir-objects" means put .o files in the same directory as the .c files +AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([orconfig.h]) |