From e826fb82394b385e3b7cdeca0e85d495204138a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr> Date: Tue, 14 Dec 2010 09:56:49 +0100 Subject: [PATCH] Build system: kalman_steady_state depends on libslicot and must be built after --- mex/build/matlab/Makefile.am | 6 +++--- mex/build/octave/Makefile.am | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mex/build/matlab/Makefile.am b/mex/build/matlab/Makefile.am index abc2a3c0de..234b2e48cf 100644 --- a/mex/build/matlab/Makefile.am +++ b/mex/build/matlab/Makefile.am @@ -1,12 +1,12 @@ ACLOCAL_AMFLAGS = -I ../../../m4 # libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_ -# libslicot must come before kalman_steady_state if DO_SOMETHING -SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ logposterior logMHMCMCposterior kalman_steady_state +SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ logposterior logMHMCMCposterior +# libslicot must come before kalman_steady_state if HAVE_FORT -SUBDIRS += libslicot +SUBDIRS += libslicot kalman_steady_state endif if HAVE_GSL diff --git a/mex/build/octave/Makefile.am b/mex/build/octave/Makefile.am index 1e5a6a5abd..0ee3759697 100644 --- a/mex/build/octave/Makefile.am +++ b/mex/build/octave/Makefile.am @@ -2,9 +2,11 @@ ACLOCAL_AMFLAGS = -I ../../../m4 # libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_ if DO_SOMETHING -SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur kalman_steady_state +SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur + +# libslicot must come before kalman_steady_state if HAVE_FORT -SUBDIRS += libslicot +SUBDIRS += libslicot kalman_steady_state endif if HAVE_GSL SUBDIRS += swz -- GitLab