Build system: no longer need to pass -pthread or -mthreads for C++11 threads as of GCC 10
parent
9c4dd1b1d0
commit
a8f5bdd525
|
@ -13,4 +13,3 @@ libinteg_a_SOURCES = \
|
||||||
vector_function.hh \
|
vector_function.hh \
|
||||||
precalc_quadrature.hh
|
precalc_quadrature.hh
|
||||||
libinteg_a_CPPFLAGS = -I../../sylv/cc -I../../utils/cc -I../../tl/cc -I$(top_srcdir)/mex/sources
|
libinteg_a_CPPFLAGS = -I../../sylv/cc -I../../utils/cc -I../../tl/cc -I$(top_srcdir)/mex/sources
|
||||||
libinteg_a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS)
|
|
||||||
|
|
|
@ -2,5 +2,4 @@ noinst_PROGRAMS = quadrature-points
|
||||||
|
|
||||||
quadrature_points_SOURCES = quadrature-points.cc
|
quadrature_points_SOURCES = quadrature-points.cc
|
||||||
quadrature_points_CPPFLAGS = -I../.. -I../../sylv/cc -I../../integ/cc -I../../tl/cc -I../../utils/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)
|
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)
|
||||||
|
|
|
@ -2,7 +2,6 @@ check_PROGRAMS = tests
|
||||||
|
|
||||||
tests_SOURCES = tests.cc
|
tests_SOURCES = tests.cc
|
||||||
tests_CPPFLAGS = -I../cc -I../../tl/cc -I../../sylv/cc -I../../utils/cc -I$(top_srcdir)/mex/sources
|
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_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)
|
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)
|
||||||
|
|
||||||
|
|
|
@ -26,13 +26,11 @@ libkord_a_SOURCES = \
|
||||||
seed_generator.hh
|
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_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
|
check_PROGRAMS = tests
|
||||||
|
|
||||||
tests_SOURCES = tests.cc
|
tests_SOURCES = tests.cc
|
||||||
tests_CPPFLAGS = -I../sylv/cc -I../tl/cc -I../integ/cc -I../utils/cc -I$(top_srcdir)/mex/sources
|
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_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)
|
tests_LDADD = libkord.a ../tl/cc/libtl.a ../sylv/cc/libsylv.a ../utils/cc/libutils.a $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) $(LIBADD_MATIO)
|
||||||
|
|
||||||
|
|
|
@ -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___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___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___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)
|
BUILT_SOURCES = $(GENERATED_FILES)
|
||||||
EXTRA_DIST = dynglob.ll dynglob.yy
|
EXTRA_DIST = dynglob.ll dynglob.yy
|
||||||
|
|
|
@ -43,4 +43,3 @@ libtl_a_SOURCES = \
|
||||||
twod_matrix.cc \
|
twod_matrix.cc \
|
||||||
twod_matrix.hh
|
twod_matrix.hh
|
||||||
libtl_a_CPPFLAGS = -I../../sylv/cc -I../../utils/cc $(CPPFLAGS_MATIO)
|
libtl_a_CPPFLAGS = -I../../sylv/cc -I../../utils/cc $(CPPFLAGS_MATIO)
|
||||||
libtl_a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS)
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ check_PROGRAMS = tests
|
||||||
|
|
||||||
tests_SOURCES = factory.cc factory.hh monoms.cc monoms.hh tests.cc
|
tests_SOURCES = factory.cc factory.hh monoms.cc monoms.hh tests.cc
|
||||||
tests_CPPFLAGS = -I../cc -I../../sylv/cc -I../../utils/cc
|
tests_CPPFLAGS = -I../cc -I../../sylv/cc -I../../utils/cc
|
||||||
tests_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS)
|
|
||||||
tests_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
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)
|
tests_LDADD = ../cc/libtl.a ../../sylv/cc/libsylv.a ../../utils/cc/libutils.a $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) $(LIBADD_MATIO)
|
||||||
|
|
||||||
|
|
|
@ -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 <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
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)
|
|
||||||
])
|
|
|
@ -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_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_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
||||||
k_order_perturbation_LDADD = ../libdynare++/libdynare++.a ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO)
|
k_order_perturbation_LDADD = ../libdynare++/libdynare++.a ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO)
|
||||||
|
|
||||||
|
|
|
@ -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_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_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
|
||||||
k_order_welfare_LDADD = ../libdynare++/libdynare++.a ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO)
|
k_order_welfare_LDADD = ../libdynare++/libdynare++.a ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO)
|
||||||
|
|
||||||
|
|
|
@ -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)
|
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++
|
# TODO: fix the codebase so that the following line is no longer needed
|
||||||
libdynare___a_CXXFLAGS = $(AM_CXXFLAGS) $(THREAD_CXXFLAGS) -Wno-unused-parameter
|
libdynare___a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-unused-parameter
|
||||||
|
|
||||||
KORD_SRCS = \
|
KORD_SRCS = \
|
||||||
approximation.cc \
|
approximation.cc \
|
||||||
|
|
|
@ -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_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 = \
|
nodist_libkorder_a_SOURCES = \
|
||||||
k_ord_dynare.cc \
|
k_ord_dynare.cc \
|
||||||
dynamic_dll.cc \
|
dynamic_dll.cc \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
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
|
||||||
dnl This file is part of Dynare.
|
dnl This file is part of Dynare.
|
||||||
dnl
|
dnl
|
||||||
|
@ -53,8 +53,6 @@ AX_PROG_LN_S
|
||||||
AC_PROG_MKDIR_P
|
AC_PROG_MKDIR_P
|
||||||
AM_PROG_AR
|
AM_PROG_AR
|
||||||
|
|
||||||
AX_CXX11_THREAD
|
|
||||||
|
|
||||||
# Get the size of a pthread_t instance, needed by pthread.F08
|
# Get the size of a pthread_t instance, needed by pthread.F08
|
||||||
AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
|
AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
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
|
||||||
dnl This file is part of Dynare.
|
dnl This file is part of Dynare.
|
||||||
dnl
|
dnl
|
||||||
|
@ -51,8 +51,6 @@ AX_PROG_LN_S
|
||||||
AC_PROG_MKDIR_P
|
AC_PROG_MKDIR_P
|
||||||
AM_PROG_AR
|
AM_PROG_AR
|
||||||
|
|
||||||
AX_CXX11_THREAD
|
|
||||||
|
|
||||||
# Get the size of a pthread_t instance, needed by pthread.F08
|
# Get the size of a pthread_t instance, needed by pthread.F08
|
||||||
AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
|
AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue