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

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

oecreview from 11518 to present

File size: 1.2 KB
  • proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am

     
    114114AM_CXXFLAGS =
    115115
    116116if MATLAB
    117 AM_LDFLAGS = $(MEXLINK)
    118 AM_CXXFLAGS=  -DMATLAB  -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
    119 LDADD +=   $(MEXLIB)
     117AM_LDFLAGS   = $(MEXLINK)
     118AM_CXXFLAGS +=  -DMATLAB  -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
     119LDADD       +=   $(MEXLIB)
    120120
    121121#64 vs 32 bits
    122122if LARGEARRAYS
     
    124124else
    125125AM_CXXFLAGS += -DMX_COMPAT_32 -D_SERIAL_
    126126endif
    127 endif 
     127endif
    128128
    129129if PYTHON
    130 AM_LDFLAGS = $(PYTHONLINK)
    131 AM_CXXFLAGS=  -DNPY_NO_DEPRECATED_API
    132 LDADD += $(BOOSTLIB) $(PYTHONLIB)
     130AM_LDFLAGS  = $(PYTHONLINK)
     131AM_CXXFLAGS+=  -DNPY_NO_DEPRECATED_API
     132LDADD      += $(BOOSTLIB) $(PYTHONLIB)
    133133endif
    134134
    135135#Triangle library
    136 AM_CXXFLAGS+=  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
     136AM_CXXFLAGS +=  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
    137137
    138138#Optimization flags:
    139139AM_CXXFLAGS += $(CXXOPTFLAGS)
    140 
    141140#}}}
    142141#Bin sources {{{1
    143142AddExternalResult_SOURCES = AddExternalResult/AddExternalResult.cpp\
Note: See TracBrowser for help on using the repository browser.