[pisa-src] r1569 - in trunk: Makefile.am configure.ac

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Sat, 07 Nov 2009 18:41:07 +0100

Author: biurrun
Date: Sat Nov  7 18:41:07 2009
New Revision: 1569

Log:
Set all automake options in configure.ac instead of doing it in two places.

Modified:
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am   Sat Nov  7 18:24:23 2009        (r1568)
+++ trunk/Makefile.am   Sat Nov  7 18:41:07 2009        (r1569)
@@ -1,7 +1,6 @@
 # Copyright (c) 2008, Distributed Systems Group, RWTH Aachen
 # All rights reserved.
 
-AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS  = -I m4
 
 # For "make dist"

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac  Sat Nov  7 18:24:23 2009        (r1568)
+++ trunk/configure.ac  Sat Nov  7 18:41:07 2009        (r1569)
@@ -12,7 +12,7 @@
 AC_INIT(pisa, [PISA_VERSION], pisa@xxxxxxxxxxxxx)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 AC_CONFIG_MACRO_DIR([m4])
 

Other related posts:

  • » [pisa-src] r1569 - in trunk: Makefile.am configure.ac - Diego Biurrun