Changeset 11852


Ignore:
Timestamp:
04/02/12 11:13:08 (13 years ago)
Author:
Mathieu Morlighem
Message:

Fixed autotools complaints

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/mex/Makefile.am

    r11849 r11852  
    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
     
    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
Note: See TracChangeset for help on using the changeset viewer.