source: issm/oecreview/Archive/11841-11860/ISSM-11851-11852.diff

Last change on this file was 11991, checked in by Eric.Larour, 13 years ago

oecreview from 11518 to present
File size: 1.2 KB
RevLine 
[11991]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11851)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11852)
5@@ -114,9 +114,9 @@
6 AM_CXXFLAGS =
7
8 if MATLAB
9-AM_LDFLAGS = $(MEXLINK)
10-AM_CXXFLAGS= -DMATLAB -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
11-LDADD += $(MEXLIB)
12+AM_LDFLAGS = $(MEXLINK)
13+AM_CXXFLAGS += -DMATLAB -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
14+LDADD += $(MEXLIB)
15
16 #64 vs 32 bits
17 if LARGEARRAYS
18@@ -124,20 +124,19 @@
19 else
20 AM_CXXFLAGS += -DMX_COMPAT_32 -D_SERIAL_
21 endif
22-endif
23+endif
24
25 if PYTHON
26-AM_LDFLAGS = $(PYTHONLINK)
27-AM_CXXFLAGS= -DNPY_NO_DEPRECATED_API
28-LDADD += $(BOOSTLIB) $(PYTHONLIB)
29+AM_LDFLAGS = $(PYTHONLINK)
30+AM_CXXFLAGS+= -DNPY_NO_DEPRECATED_API
31+LDADD += $(BOOSTLIB) $(PYTHONLIB)
32 endif
33
34 #Triangle library
35-AM_CXXFLAGS+= -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
36+AM_CXXFLAGS += -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
37
38 #Optimization flags:
39 AM_CXXFLAGS += $(CXXOPTFLAGS)
40-
41 #}}}
42 #Bin sources {{{1
43 AddExternalResult_SOURCES = AddExternalResult/AddExternalResult.cpp\
Note: See TracBrowser for help on using the repository browser.