From ba6c1da0eee67bca34b8c0b9ec4ad87fe81ad4ec Mon Sep 17 00:00:00 2001 From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152> Date: Tue, 3 Nov 2009 12:48:26 +0000 Subject: [PATCH] Build system: minor fixes git-svn-id: https://www.dynare.org/svn/dynare/trunk@3119 ac1d8469-bf42-47a9-8791-bf33cf982152 --- dynare++/Makefile.am | 2 +- mex/build/dynare_simul_.am | 5 ++++- mex/build/k_order_perturbation.am | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dynare++/Makefile.am b/dynare++/Makefile.am index 1145fb694..881f5fca7 100644 --- a/dynare++/Makefile.am +++ b/dynare++/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = sylv parser/cc tl doc utils/cc integ kord src -EXTRA_DIST = change_log.html c++lib.w tests +EXTRA_DIST = change_log.html c++lib.w tests extern diff --git a/mex/build/dynare_simul_.am b/mex/build/dynare_simul_.am index 672adb696..b9a12eae9 100644 --- a/mex/build/dynare_simul_.am +++ b/mex/build/dynare_simul_.am @@ -5,6 +5,9 @@ noinst_PROGRAMS = dynare_simul_ # Can't use gensylv_CPPFLAGS, because it interacts badly with VPATH CPPFLAGS += -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../sources -dynare_simul__LDADD = ../libdynare++/libdynare++.a +CXXFLAGS += $(PTHREAD_CFLAGS) + +# libdynare++ must come before pthread +dynare_simul__LDADD = ../libdynare++/libdynare++.a $(PTHREAD_LIBS) nodist_dynare_simul__SOURCES = dynare_simul.cpp diff --git a/mex/build/k_order_perturbation.am b/mex/build/k_order_perturbation.am index 54d7ded32..8560501b4 100644 --- a/mex/build/k_order_perturbation.am +++ b/mex/build/k_order_perturbation.am @@ -7,7 +7,8 @@ CPPFLAGS += -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynar CXXFLAGS += $(PTHREAD_CFLAGS) -k_order_perturbation_LDADD = $(PTHREAD_LIBS) $(LIBADD_DLOPEN) ../libdynare++/libdynare++.a +# libdynare++ must come before pthread +k_order_perturbation_LDADD = ../libdynare++/libdynare++.a $(PTHREAD_LIBS) $(LIBADD_DLOPEN) nodist_k_order_perturbation_SOURCES = \ k_order_perturbation.cpp \ -- GitLab