Fix build system with Automake 1.12
parent
5b1ecaf627
commit
3e612e0211
|
@ -26,6 +26,7 @@ depcomp
|
|||
install-sh
|
||||
missing
|
||||
ylwrap
|
||||
ar-lib
|
||||
|
||||
# Doc rules
|
||||
*.pdf
|
||||
|
|
|
@ -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 -Werror foreign no-dist-gzip dist-xz tar-pax])
|
||||
AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax])
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
|
@ -55,6 +55,7 @@ CXXFLAGS="$CXXFLAGS -Wall -Wno-parentheses"
|
|||
AC_CHECK_PROGS([AR], [ar ${host_alias}-ar])
|
||||
|
||||
AC_PROG_RANLIB
|
||||
AM_PROG_AR
|
||||
|
||||
AX_PROG_LN_S
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
noinst_PROGRAMS = bytecode
|
||||
|
||||
bytecode_CPPFLAGS = -I$(top_srcdir)/../../sources/bytecode -I$(top_srcdir)/../../../preprocessor
|
||||
bytecode_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../../sources/bytecode -I$(top_srcdir)/../../../preprocessor
|
||||
|
||||
TOPDIR = $(top_srcdir)/../../sources/bytecode
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
noinst_PROGRAMS = dynare_simul_
|
||||
|
||||
dynare_simul__CPPFLAGS = -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
|
||||
dynare_simul__CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
|
||||
|
||||
dynare_simul__CXXFLAGS = $(PTHREAD_CFLAGS)
|
||||
dynare_simul__CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
|
||||
|
||||
# libdynare++ must come before pthread
|
||||
dynare_simul__LDFLAGS = $(LDFLAGS_MATIO)
|
||||
dynare_simul__LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
||||
dynare_simul__LDADD = ../libdynare++/libdynare++.a $(PTHREAD_LIBS) $(LIBADD_MATIO)
|
||||
|
||||
nodist_dynare_simul__SOURCES = $(top_srcdir)/../../../dynare++/extern/matlab/dynare_simul.cpp
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
noinst_PROGRAMS = logposterior logMHMCMCposterior
|
||||
|
||||
# We use shared flags so that automake does not compile things two times
|
||||
CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils $(CPPFLAGS_MATIO) $(BOOST_CPPFLAGS)
|
||||
LDFLAGS += $(LDFLAGS_MATIO) $(BOOST_LDFLAGS)
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils $(CPPFLAGS_MATIO) $(BOOST_CPPFLAGS)
|
||||
AM_LDFLAGS += $(LDFLAGS_MATIO) $(BOOST_LDFLAGS)
|
||||
LDADD = $(LIBADD_DLOPEN) $(LIBADD_MATIO)
|
||||
|
||||
TOPDIR = $(top_srcdir)/../../sources/estimation
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
noinst_PROGRAMS = gensylv
|
||||
|
||||
gensylv_CPPFLAGS = -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../sources
|
||||
gensylv_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../sources
|
||||
|
||||
gensylv_LDADD = ../libdynare++/libdynare++.a
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
noinst_PROGRAMS = k_order_perturbation
|
||||
|
||||
k_order_perturbation_CPPFLAGS = -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
|
||||
k_order_perturbation_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
|
||||
|
||||
k_order_perturbation_CXXFLAGS = $(PTHREAD_CFLAGS)
|
||||
k_order_perturbation_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
|
||||
|
||||
# libdynare++ must come before pthread
|
||||
k_order_perturbation_LDFLAGS = $(LDFLAGS_MATIO)
|
||||
k_order_perturbation_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
||||
k_order_perturbation_LDADD = ../libdynare++/libdynare++.a $(PTHREAD_LIBS) $(LIBADD_DLOPEN) $(LIBADD_MATIO)
|
||||
|
||||
TOPDIR = $(top_srcdir)/../../sources/k_order_perturbation
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
noinst_PROGRAMS = kalman_steady_state
|
||||
|
||||
kalman_steady_state_LDADD = $(LIBADD_SLICOT)
|
||||
kalman_steady_state_LDFLAGS = $(LDFLAGS_SLICOT)
|
||||
kalman_steady_state_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_SLICOT)
|
||||
|
||||
nodist_kalman_steady_state_SOURCES = $(top_srcdir)/../../sources/kalman_steady_state/kalman_steady_state.cc
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
noinst_LIBRARIES = libdynare++.a
|
||||
|
||||
libdynare___a_CPPFLAGS = -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
|
||||
libdynare___a_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
|
||||
|
||||
libdynare___a_CXXFLAGS = $(PTHREAD_CFLAGS)
|
||||
libdynare___a_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
|
||||
|
||||
TOPDIR = $(top_srcdir)/../../../dynare++
|
||||
|
||||
|
|
|
@ -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 -Werror foreign])
|
||||
AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
|
||||
|
||||
dnl The following must occur before we modify CFLAGS/CXXFLAGS
|
||||
AC_CANONICAL_HOST
|
||||
|
@ -59,6 +59,7 @@ AC_PROG_CXX
|
|||
AC_PROG_RANLIB
|
||||
AX_PROG_LN_S
|
||||
AC_PROG_MKDIR_P
|
||||
AM_PROG_AR
|
||||
AX_PTHREAD
|
||||
# Check for boost libraries used in estimation DLL
|
||||
AC_LANG_PUSH([C++])
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
EXEEXT = $(MEXEXT)
|
||||
|
||||
CPPFLAGS += $(MATLAB_CPPFLAGS)
|
||||
CPPFLAGS += -I$(top_srcdir)/../../sources
|
||||
AM_CPPFLAGS = $(MATLAB_CPPFLAGS)
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/../../sources
|
||||
|
||||
DEFS += $(MATLAB_DEFS)
|
||||
DEFS += -DMATLAB_MEX_FILE
|
||||
DEFS += -DMEXEXT=\"$(MEXEXT)\"
|
||||
|
||||
LDFLAGS += $(MATLAB_LDFLAGS)
|
||||
AM_LDFLAGS = $(MATLAB_LDFLAGS)
|
||||
LIBS += $(MATLAB_LIBS)
|
||||
|
||||
all-local:
|
||||
|
|
|
@ -6,10 +6,10 @@ DWUTILITIESDIR = $(top_srcdir)/../../../contrib/ms-sbvar/utilities_dw
|
|||
DYNMEXSRCDIR = $(top_srcdir)/../../sources
|
||||
MSMEXSRCDIR = $(DYNMEXSRCDIR)/ms-sbvar
|
||||
|
||||
CPPFLAGS += $(GSL_CPPFLAGS) -DSTRUCTURED_COLUMN_MAJOR -I$(DYNMEXSRCDIR) -I$(MSMEXSRCDIR) -I$(DWUTILITIESDIR)/include -I$(DWSWITCHDIR)/switching -I$(DWSWITCHDIR)/state_space -I$(DWSWITCHDIR)/state_space/sbvar
|
||||
AM_CPPFLAGS += $(GSL_CPPFLAGS) -DSTRUCTURED_COLUMN_MAJOR -I$(DYNMEXSRCDIR) -I$(MSMEXSRCDIR) -I$(DWUTILITIESDIR)/include -I$(DWSWITCHDIR)/switching -I$(DWSWITCHDIR)/state_space -I$(DWSWITCHDIR)/state_space/sbvar
|
||||
|
||||
LIBS += $(GSL_LIBS)
|
||||
LDFLAGS += $(GSL_LDFLAGS)
|
||||
AM_LDFLAGS += $(GSL_LDFLAGS)
|
||||
|
||||
DWUTILS = \
|
||||
$(DWUTILITIESDIR)/arrays/dw_array.c \
|
||||
|
|
|
@ -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 -Werror foreign])
|
||||
AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
|
||||
|
||||
AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])
|
||||
|
||||
|
@ -42,6 +42,7 @@ AC_PROG_CXX
|
|||
AC_PROG_RANLIB
|
||||
AX_PROG_LN_S
|
||||
AC_PROG_MKDIR_P
|
||||
AM_PROG_AR
|
||||
AX_PTHREAD
|
||||
# Check for boost libraries used in estimation DLL
|
||||
AC_LANG_PUSH([C++])
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
CPPFLAGS += $(shell $(MKOCTFILE) -p CPPFLAGS)
|
||||
CPPFLAGS += $(shell $(MKOCTFILE) -p INCFLAGS)
|
||||
CPPFLAGS += -I$(top_srcdir)/../../sources
|
||||
AM_CPPFLAGS = $(shell $(MKOCTFILE) -p CPPFLAGS)
|
||||
AM_CPPFLAGS += $(shell $(MKOCTFILE) -p INCFLAGS)
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/../../sources
|
||||
|
||||
DEFS += -DOCTAVE_MEX_FILE
|
||||
DEFS += -DMEXEXT=\".mex\"
|
||||
|
||||
CFLAGS += $(shell $(MKOCTFILE) -p CPICFLAG)
|
||||
FFLAGS += $(shell $(MKOCTFILE) -p FPICFLAG)
|
||||
CXXFLAGS += $(shell $(MKOCTFILE) -p CXXPICFLAG)
|
||||
AM_CFLAGS = $(shell $(MKOCTFILE) -p CPICFLAG)
|
||||
AM_FFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG)
|
||||
AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG)
|
||||
|
||||
LDFLAGS += $(shell $(MKOCTFILE) -p DL_LDFLAGS)
|
||||
LDFLAGS += $(shell $(MKOCTFILE) -p LFLAGS)
|
||||
LDFLAGS += $(shell $(MKOCTFILE) -p LDFLAGS)
|
||||
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS)
|
||||
AM_LDFLAGS += $(shell $(MKOCTFILE) -p LFLAGS)
|
||||
AM_LDFLAGS += $(shell $(MKOCTFILE) -p LDFLAGS)
|
||||
|
||||
LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
|
||||
LIBS += $(shell $(MKOCTFILE) -p BLAS_LIBS)
|
||||
|
|
|
@ -2,11 +2,11 @@ EXEEXT = .mex
|
|||
include ../mex.am
|
||||
include ../../ms_sbvar.am
|
||||
|
||||
ms_sbvar_command_line_CPPFLAGS = $(CPPFLAGS_MATIO)
|
||||
ms_sbvar_create_init_file_CPPFLAGS = $(CPPFLAGS_MATIO)
|
||||
ms_sbvar_command_line_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MATIO)
|
||||
ms_sbvar_create_init_file_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MATIO)
|
||||
|
||||
ms_sbvar_command_line_LDFLAGS = $(LDFLAGS_MATIO)
|
||||
ms_sbvar_create_init_file_LDFLAGS = $(LDFLAGS_MATIO)
|
||||
ms_sbvar_command_line_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
||||
ms_sbvar_create_init_file_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
||||
|
||||
ms_sbvar_command_line_LDADD = $(LIBADD_MATIO)
|
||||
ms_sbvar_create_init_file_LDADD = $(LIBADD_MATIO)
|
||||
|
|
Loading…
Reference in New Issue