diff --git a/.gitignore b/.gitignore index bd5ffa8c5faed4485bd9dc4640afc00d800be2ac..e65d5cda1aa281ba43fd4a04d15abba30e7ed518 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ depcomp install-sh missing ylwrap +ar-lib # Doc rules *.pdf diff --git a/configure.ac b/configure.ac old mode 100644 new mode 100755 index 637e3ae8817959ac275b6a7943c362fd95c84a3a..84b3d94877af1fe1b15d0ace7f370c97a8dc33a6 --- 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 -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 diff --git a/mex/build/bytecode.am b/mex/build/bytecode.am old mode 100644 new mode 100755 index 4d5193eb9bcedcdf09a4ed49e1dfc17e6b345af5..66a29a3e98dc142dbfa604acc04f20b667890187 --- a/mex/build/bytecode.am +++ b/mex/build/bytecode.am @@ -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 diff --git a/mex/build/dynare_simul_.am b/mex/build/dynare_simul_.am old mode 100644 new mode 100755 index 91d0becb8e616a67b25f4743914556f440d8bf1e..e0792c7e9b387deaf2246e436913103b2bc6dd69 --- a/mex/build/dynare_simul_.am +++ b/mex/build/dynare_simul_.am @@ -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 diff --git a/mex/build/estimation.am b/mex/build/estimation.am old mode 100644 new mode 100755 index 22b3dab9baaff97d7985819040390adbde55221d..30c848542f9efe2356b33d81231aef5ceb1a8f4f --- a/mex/build/estimation.am +++ b/mex/build/estimation.am @@ -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 diff --git a/mex/build/gensylv.am b/mex/build/gensylv.am old mode 100644 new mode 100755 index 80e1c6ca1edb958ea461b29821d44b955c56919d..81e27b44854a952ea40abb168a0201a39942b29b --- a/mex/build/gensylv.am +++ b/mex/build/gensylv.am @@ -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 diff --git a/mex/build/k_order_perturbation.am b/mex/build/k_order_perturbation.am old mode 100644 new mode 100755 index 1bc3d77508f5f42cd933e15667ca6136aebadc20..4e8b85d24b1774cf894225fd488518b32192cfde --- a/mex/build/k_order_perturbation.am +++ b/mex/build/k_order_perturbation.am @@ -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 diff --git a/mex/build/kalman_steady_state.am b/mex/build/kalman_steady_state.am old mode 100644 new mode 100755 index 2413e0b61f6dc308ca471d312255bc8a7ab38cee..2ed84603e1ab90f67d320a36890dcd9e7f8f08ff --- a/mex/build/kalman_steady_state.am +++ b/mex/build/kalman_steady_state.am @@ -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 diff --git a/mex/build/libdynare++.am b/mex/build/libdynare++.am old mode 100644 new mode 100755 index c2f9c80952ee156b5b993219f168bfe9cc661392..b762f65500d9bc0a324a479aba2f2c16a3c1f471 --- a/mex/build/libdynare++.am +++ b/mex/build/libdynare++.am @@ -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++ diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac old mode 100644 new mode 100755 index 838f951223917b83aec75acb6216a26faee54555..25d810da0608f8be3e55c5b76076247b72b67b64 --- 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 -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++]) diff --git a/mex/build/matlab/mex.am b/mex/build/matlab/mex.am old mode 100644 new mode 100755 index cfeabedcde9a7b7ac74762567e9ba28c2108941e..59c6e2029fe87016665325f86f19a8b9227aa1b1 --- a/mex/build/matlab/mex.am +++ b/mex/build/matlab/mex.am @@ -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: diff --git a/mex/build/ms_sbvar.am b/mex/build/ms_sbvar.am old mode 100644 new mode 100755 index f39bca2184d11947b1958b32fd0e965308e68289..da4b19b7daa08fd7affd50d372f9fc91c20c94f2 --- a/mex/build/ms_sbvar.am +++ b/mex/build/ms_sbvar.am @@ -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 \ diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac old mode 100644 new mode 100755 index 88a9089d7ee684f26e9d4c5b9206ca0c4e56bd84..0868f465bddd3aae35f13d8930aed780da54aa8e --- 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 -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++]) diff --git a/mex/build/octave/mex.am b/mex/build/octave/mex.am old mode 100644 new mode 100755 index 20fefd2cc938d082182b84322f97ac62d6ed4cd4..0b6323b3e72595de5568b565b4f51322db823c18 --- a/mex/build/octave/mex.am +++ b/mex/build/octave/mex.am @@ -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) diff --git a/mex/build/octave/ms_sbvar/Makefile.am b/mex/build/octave/ms_sbvar/Makefile.am index f81f84191e4b7c1421b3b0a6b5530967fe25d2c1..52adaebfb7cb3fc47009ac327068e9147a1328ec 100644 --- a/mex/build/octave/ms_sbvar/Makefile.am +++ b/mex/build/octave/ms_sbvar/Makefile.am @@ -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)