From 0ce79e7cb20369a368a9ff26a4c5c40bbad9146c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Tue, 25 Sep 2012 19:53:20 +0200 Subject: [PATCH] More CPPFLAGS_MATIO fun (cherry picked from commit 6cfec3f6ad1793a3cf39d998983d4237bd8fd945) --- mex/build/ms_sbvar.am | 2 +- mex/build/octave/ms_sbvar/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mex/build/ms_sbvar.am b/mex/build/ms_sbvar.am index 48e7a027e..f39bca218 100644 --- a/mex/build/ms_sbvar.am +++ b/mex/build/ms_sbvar.am @@ -6,7 +6,7 @@ DWUTILITIESDIR = $(top_srcdir)/../../../contrib/ms-sbvar/utilities_dw DYNMEXSRCDIR = $(top_srcdir)/../../sources MSMEXSRCDIR = $(DYNMEXSRCDIR)/ms-sbvar -CPPFLAGS += $(GSL_CPPFLAGS) $(CPPFLAGS_MATIO) -DSTRUCTURED_COLUMN_MAJOR -I$(DYNMEXSRCDIR) -I$(MSMEXSRCDIR) -I$(DWUTILITIESDIR)/include -I$(DWSWITCHDIR)/switching -I$(DWSWITCHDIR)/state_space -I$(DWSWITCHDIR)/state_space/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 LIBS += $(GSL_LIBS) LDFLAGS += $(GSL_LDFLAGS) diff --git a/mex/build/octave/ms_sbvar/Makefile.am b/mex/build/octave/ms_sbvar/Makefile.am index 544c8e975..4838d211d 100644 --- a/mex/build/octave/ms_sbvar/Makefile.am +++ b/mex/build/octave/ms_sbvar/Makefile.am @@ -2,8 +2,8 @@ EXEEXT = .mex include ../mex.am include ../../ms_sbvar.am -ms_sbvar_command_line_CPPLAGS = $(MATIO_CPPFLAGS) -ms_sbvar_create_init_file_CPPLAGS = $(MATIO_CPPFLAGS) +ms_sbvar_command_line_CPPLAGS = $(CPPFLAGS_MATIO) +ms_sbvar_create_init_file_CPPLAGS = $(CPPFLAGS_MATIO) ms_sbvar_command_line_LDFLAGS = $(LDFLAGS_MATIO) ms_sbvar_create_init_file_LDFLAGS = $(LDFLAGS_MATIO) -- GitLab