From d8e9bc978d0984fc2850e9fcd44aa7faef5a8dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Mon, 9 Sep 2013 14:47:29 +0200 Subject: [PATCH] Revert "Compatibility fix with automake 1.14" This reverts commit 7541bb52f5bcf99615c34670e5febd04666662b7. This commit was breaking compilation of MEX files: the subdir-objects option does not deal well with source files that are under a distinct tree. --- configure.ac | 2 +- mex/build/matlab/configure.ac | 2 +- mex/build/octave/configure.ac | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ad8734d97..61136d512 100755 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.62]) AC_INIT([dynare], [4.4-unstable]) AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc]) -AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax subdir-objects]) +AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax]) AC_PROG_CC AC_PROG_CXX diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index 9686b58d4..25d810da0 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.62]) AC_INIT([dynare], [4.4-unstable]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign subdir-objects]) +AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign]) dnl The following must occur before we modify CFLAGS/CXXFLAGS AC_CANONICAL_HOST diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac index 09d719a2a..98914a30d 100755 --- a/mex/build/octave/configure.ac +++ b/mex/build/octave/configure.ac @@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.62]) AC_INIT([dynare], [4.4-unstable]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign subdir-objects]) +AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign]) AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile]) -- GitLab