aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorcypherpunks <cypherpunks@torproject.org>2016-02-26 12:53:28 +0000
committerNick Mathewson <nickm@torproject.org>2016-03-11 10:08:53 -0500
commit25fa21802f578db0e2852084a95a23b60ef1d1e9 (patch)
tree1bef9565ae8d1b59649d6ac503998ac518fdc27f /Makefile.am
parentef31c8862f4ed86cfa4987b2ec58468269457f87 (diff)
downloadtor-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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 0 insertions, 5 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=