summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhys Kidd <rhyskidd@gmail.com>2019-01-21 00:52:21 -0500
committerIlia Mirkin <imirkin@alum.mit.edu>2019-01-21 21:29:55 -0500
commita566c883b3663b685e467788b8b5de6d99ef9ae2 (patch)
tree451313f7253e107d1b2bc730bbb3be7f061c848b
parent56e67e09925b0b5544884b279b9cc5552964fd25 (diff)
downloadxorg-driver-xf86-video-nouveau-a566c883b3663b685e467788b8b5de6d99ef9ae2.tar.gz
config: Set automake options consistently in one location
Avoid use of two manners of setting automake configuration options, and consolidate them into AM_INIT_AUTOMAKE macro. Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 05e9ec6..f40ae43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
-
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src man
diff --git a/configure.ac b/configure.ac
index d1bd8b4..bcbb8ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])