diff --git a/mex/build/ms_sbvar.am b/mex/build/ms_sbvar.am index 48e7a027e3527d20e08ed21e1ec1fd511317f456..f39bca2184d11947b1958b32fd0e965308e68289 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 544c8e975ca808b10e869417ffa66b3b42849e8e..4838d211d0df79bbeb726abf4acf39bad0cc949f 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)