Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11851) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11852) @@ -114,9 +114,9 @@ AM_CXXFLAGS = if MATLAB -AM_LDFLAGS = $(MEXLINK) -AM_CXXFLAGS= -DMATLAB -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread -LDADD += $(MEXLIB) +AM_LDFLAGS = $(MEXLINK) +AM_CXXFLAGS += -DMATLAB -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread +LDADD += $(MEXLIB) #64 vs 32 bits if LARGEARRAYS @@ -124,20 +124,19 @@ else AM_CXXFLAGS += -DMX_COMPAT_32 -D_SERIAL_ endif -endif +endif if PYTHON -AM_LDFLAGS = $(PYTHONLINK) -AM_CXXFLAGS= -DNPY_NO_DEPRECATED_API -LDADD += $(BOOSTLIB) $(PYTHONLIB) +AM_LDFLAGS = $(PYTHONLINK) +AM_CXXFLAGS+= -DNPY_NO_DEPRECATED_API +LDADD += $(BOOSTLIB) $(PYTHONLIB) endif #Triangle library -AM_CXXFLAGS+= -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER +AM_CXXFLAGS += -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER #Optimization flags: AM_CXXFLAGS += $(CXXOPTFLAGS) - #}}} #Bin sources {{{1 AddExternalResult_SOURCES = AddExternalResult/AddExternalResult.cpp\