diff --git a/dynare++/integ/cc/Makefile.am b/dynare++/integ/cc/Makefile.am index 49c3ab5ac..4e98a7640 100644 --- a/dynare++/integ/cc/Makefile.am +++ b/dynare++/integ/cc/Makefile.am @@ -13,4 +13,3 @@ libinteg_a_SOURCES = \ vector_function.hh \ precalc_quadrature.hh libinteg_a_CPPFLAGS = -I../../sylv/cc -I../../utils/cc -I../../tl/cc -I$(top_srcdir)/mex/sources -libinteg_a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) diff --git a/dynare++/integ/src/Makefile.am b/dynare++/integ/src/Makefile.am index 635be1ef0..6eec5e1b4 100644 --- a/dynare++/integ/src/Makefile.am +++ b/dynare++/integ/src/Makefile.am @@ -2,5 +2,4 @@ noinst_PROGRAMS = quadrature-points quadrature_points_SOURCES = quadrature-points.cc quadrature_points_CPPFLAGS = -I../.. -I../../sylv/cc -I../../integ/cc -I../../tl/cc -I../../utils/cc -quadrature_points_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) quadrature_points_LDADD = ../cc/libinteg.a ../../tl/cc/libtl.a ../../parser/cc/libparser.a ../../sylv/cc/libsylv.a ../../utils/cc/libutils.a $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) diff --git a/dynare++/integ/testing/Makefile.am b/dynare++/integ/testing/Makefile.am index 24bd2517a..2b7dcf48b 100644 --- a/dynare++/integ/testing/Makefile.am +++ b/dynare++/integ/testing/Makefile.am @@ -2,7 +2,6 @@ check_PROGRAMS = tests tests_SOURCES = tests.cc tests_CPPFLAGS = -I../cc -I../../tl/cc -I../../sylv/cc -I../../utils/cc -I$(top_srcdir)/mex/sources -tests_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) tests_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO) tests_LDADD = ../../sylv/cc/libsylv.a ../cc/libinteg.a ../../tl/cc/libtl.a ../../utils/cc/libutils.a $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) $(LIBADD_MATIO) diff --git a/dynare++/kord/Makefile.am b/dynare++/kord/Makefile.am index 1e615c092..2779a7544 100644 --- a/dynare++/kord/Makefile.am +++ b/dynare++/kord/Makefile.am @@ -26,13 +26,11 @@ libkord_a_SOURCES = \ seed_generator.hh libkord_a_CPPFLAGS = -I../sylv/cc -I../tl/cc -I../integ/cc -I../utils/cc -I$(top_srcdir)/mex/sources $(CPPFLAGS_MATIO) -DDYNVERSION=\"$(PACKAGE_VERSION)\" -libkord_a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) check_PROGRAMS = tests tests_SOURCES = tests.cc tests_CPPFLAGS = -I../sylv/cc -I../tl/cc -I../integ/cc -I../utils/cc -I$(top_srcdir)/mex/sources -tests_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) tests_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO) tests_LDADD = libkord.a ../tl/cc/libtl.a ../sylv/cc/libsylv.a ../utils/cc/libutils.a $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) $(LIBADD_MATIO) diff --git a/dynare++/src/Makefile.am b/dynare++/src/Makefile.am index cb42b216f..85abffa34 100644 --- a/dynare++/src/Makefile.am +++ b/dynare++/src/Makefile.am @@ -24,7 +24,6 @@ dynare___SOURCES = \ dynare___CPPFLAGS = -I../sylv/cc -I../tl/cc -I../kord -I../integ/cc -I../utils/cc -I.. -I$(top_srcdir)/mex/sources $(BOOST_CPPFLAGS) $(CPPFLAGS_MATIO) dynare___LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO) $(BOOST_LDFLAGS) dynare___LDADD = ../kord/libkord.a ../integ/cc/libinteg.a ../tl/cc/libtl.a ../parser/cc/libparser.a ../utils/cc/libutils.a ../sylv/cc/libsylv.a $(LIBADD_MATIO) $(noinst_LIBRARIES) $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) -dynare___CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) BUILT_SOURCES = $(GENERATED_FILES) EXTRA_DIST = dynglob.ll dynglob.yy diff --git a/dynare++/tl/cc/Makefile.am b/dynare++/tl/cc/Makefile.am index c79c93317..026cb13f1 100644 --- a/dynare++/tl/cc/Makefile.am +++ b/dynare++/tl/cc/Makefile.am @@ -43,4 +43,3 @@ libtl_a_SOURCES = \ twod_matrix.cc \ twod_matrix.hh libtl_a_CPPFLAGS = -I../../sylv/cc -I../../utils/cc $(CPPFLAGS_MATIO) -libtl_a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) diff --git a/dynare++/tl/testing/Makefile.am b/dynare++/tl/testing/Makefile.am index 2bb933ed6..7f5e4cdf9 100644 --- a/dynare++/tl/testing/Makefile.am +++ b/dynare++/tl/testing/Makefile.am @@ -2,7 +2,6 @@ check_PROGRAMS = tests tests_SOURCES = factory.cc factory.hh monoms.cc monoms.hh tests.cc tests_CPPFLAGS = -I../cc -I../../sylv/cc -I../../utils/cc -tests_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) tests_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO) tests_LDADD = ../cc/libtl.a ../../sylv/cc/libsylv.a ../../utils/cc/libutils.a $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) $(LIBADD_MATIO) diff --git a/m4/ax_cxx11_thread.m4 b/m4/ax_cxx11_thread.m4 deleted file mode 100644 index 690752154..000000000 --- a/m4/ax_cxx11_thread.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl Adds flags needed to compile programs using C++11 threads - -dnl Copyright © 2019 Dynare Team -dnl -dnl This file is part of Dynare. -dnl -dnl Dynare is free software: you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation, either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl Dynare is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with Dynare. If not, see . - -AC_DEFUN([AX_CXX11_THREAD], -[ - AC_REQUIRE([AC_CANONICAL_BUILD]) - case ${host_os} in - *mingw32*) - THREAD_CXXFLAGS="-mthreads $THREAD_CXXFLAGS" - ;; - *) - THREAD_CXXFLAGS="-pthread $THREAD_CXXFLAGS" - ;; - esac - - AC_SUBST(THREAD_CXXFLAGS) -]) diff --git a/mex/build/k_order_perturbation.am b/mex/build/k_order_perturbation.am index 9aed1edf7..5da9f5c79 100644 --- a/mex/build/k_order_perturbation.am +++ b/mex/build/k_order_perturbation.am @@ -4,8 +4,6 @@ TOPDIR = $(top_srcdir)/../../sources/k_order_perturbation 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$(TOPDIR) $(CPPFLAGS_MATIO) -k_order_perturbation_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) - k_order_perturbation_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO) k_order_perturbation_LDADD = ../libdynare++/libdynare++.a ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO) diff --git a/mex/build/k_order_welfare.am b/mex/build/k_order_welfare.am index 62da9fe2b..f92702035 100644 --- a/mex/build/k_order_welfare.am +++ b/mex/build/k_order_welfare.am @@ -4,8 +4,6 @@ TOPDIR = $(top_srcdir)/../../sources/k_order_welfare k_order_welfare_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR) -I$(TOPDIR)/../k_order_perturbation -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/utils/cc $(CPPFLAGS_MATIO) -k_order_welfare_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) - k_order_welfare_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO) k_order_welfare_LDADD = ../libdynare++/libdynare++.a ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO) diff --git a/mex/build/libdynare++.am b/mex/build/libdynare++.am index 8fceeb334..bb062275b 100644 --- a/mex/build/libdynare++.am +++ b/mex/build/libdynare++.am @@ -4,8 +4,8 @@ TOPDIR = $(top_srcdir)/../../../dynare++ libdynare___a_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR)/src -I$(TOPDIR)/kord -I$(TOPDIR)/tl/cc -I$(TOPDIR)/utils/cc -I$(TOPDIR)/sylv/cc -I$(TOPDIR)/integ/cc $(CPPFLAGS_MATIO) -# TODO: Remove -Wno-unused-parameter once the same has been done for Dynare++ -libdynare___a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) -Wno-unused-parameter +# TODO: fix the codebase so that the following line is no longer needed +libdynare___a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-unused-parameter KORD_SRCS = \ approximation.cc \ diff --git a/mex/build/libkorder.am b/mex/build/libkorder.am index 59f023c84..093b68819 100644 --- a/mex/build/libkorder.am +++ b/mex/build/libkorder.am @@ -4,8 +4,6 @@ TOPDIR = $(top_srcdir)/../../sources/k_order_perturbation libkorder_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR) -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/utils/cc $(CPPFLAGS_MATIO) -libkorder_a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) - nodist_libkorder_a_SOURCES = \ k_ord_dynare.cc \ dynamic_dll.cc \ diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index 052fd0084..901576c47 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright © 2009-2022 Dynare Team +dnl Copyright © 2009-2023 Dynare Team dnl dnl This file is part of Dynare. dnl @@ -53,8 +53,6 @@ AX_PROG_LN_S AC_PROG_MKDIR_P AM_PROG_AR -AX_CXX11_THREAD - # Get the size of a pthread_t instance, needed by pthread.F08 AC_CHECK_SIZEOF([pthread_t], [], [#include ]) diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac index 16b2b34f2..815f1decc 100644 --- a/mex/build/octave/configure.ac +++ b/mex/build/octave/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright © 2009-2022 Dynare Team +dnl Copyright © 2009-2023 Dynare Team dnl dnl This file is part of Dynare. dnl @@ -51,8 +51,6 @@ AX_PROG_LN_S AC_PROG_MKDIR_P AM_PROG_AR -AX_CXX11_THREAD - # Get the size of a pthread_t instance, needed by pthread.F08 AC_CHECK_SIZEOF([pthread_t], [], [#include ])