torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move Automake options to configure.ac

Browse Source 
This will centralize the version configuration in one file to simplify
future changes.

Also fixes some typos in the Automake options comments.
This commit is contained in:
cypherpunks
2016-02-26 12:53:28 +00:00
committed by Nick Mathewson
parent ef31c8862f
commit 25fa21802f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
-5
View File
@@ -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=
configure.ac
+6 -1
View File
@@ -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])