Commit 4d98c200 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Rename CFLAGS_MATIO to CPPFLAGS_MATIO

parent e67d3d3f
......@@ -25,28 +25,28 @@ AC_ARG_WITH(matio, AC_HELP_STRING([--with-matio=DIR], [prefix to MATIO installat
has_matio=yes
if test "x$matio_prefix" != "x"; then
CFLAGS_MATIO="-I$withval/include"
CPPFLAGS_MATIO="-I$withval/include"
LDFLAGS_MATIO="-L$withval/lib"
else
CFLAGS_MATIO=""
CPPFLAGS_MATIO=""
LDFLAGS_MATIO=""
fi
ac_save_CFLAGS="$CFLAGS"
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LDFLAGS="$LDFLAGS"
LIBADD_MATIO=""
CFLAGS="$CFLAGS_MATIO $CFLAGS"
CPPFLAGS="$CPPFLAGS_MATIO $CPPFLAGS"
LDFLAGS="$LDFLAGS_MATIO $LDFLAGS"
AC_CHECK_HEADER([matio.h], [], [has_matio=no])
AC_CHECK_LIB([matio], [Mat_Open], [LIBADD_MATIO="-lmatio"], [has_matio=no])
CFLAGS="$ac_save_CFLAGS"
CPPFLAGS="$ac_save_CPPFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
AC_SUBST(CFLAGS_MATIO)
AC_SUBST(CPPFLAGS_MATIO)
AC_SUBST(LIBADD_MATIO)
AC_SUBST(LDFLAGS_MATIO)
])
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 $(CFLAGS_MATIO)
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__CXXFLAGS = $(PTHREAD_CFLAGS)
......
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 $(CFLAGS_MATIO) $(BOOST_CPPFLAGS)
CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils $(CPPFLAGS_MATIO) $(BOOST_CPPFLAGS)
LDFLAGS += $(LDFLAGS_MATIO) $(BOOST_LDFLAGS)
LDADD = $(LIBADD_DLOPEN) $(LIBADD_MATIO)
......
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
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_CXXFLAGS = $(CFLAGS_MATIO) $(PTHREAD_CFLAGS)
k_order_perturbation_CXXFLAGS = $(PTHREAD_CFLAGS)
# libdynare++ must come before pthread
k_order_perturbation_LDFLAGS = $(LDFLAGS_MATIO)
......
......@@ -2,8 +2,8 @@ EXEEXT = .mex
include ../mex.am
include ../../ms_sbvar.am
ms_sbvar_command_line_CPPLAGS = $(MATIO_CFLAGS)
ms_sbvar_create_init_file_CPPLAGS = $(MATIO_CFLAGS)
ms_sbvar_command_line_CPPLAGS = $(MATIO_CPPFLAGS)
ms_sbvar_create_init_file_CPPLAGS = $(MATIO_CPPFLAGS)
ms_sbvar_command_line_LDFLAGS = $(LDFLAGS_MATIO)
ms_sbvar_create_init_file_LDFLAGS = $(LDFLAGS_MATIO)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment