source: issm/oecreview/Archive/12061-12080/ISSM-12073-12074.diff@ 12325

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

11990 to 12321 oec compliance
File size: 1.0 KB
RevLine 
[12325]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 12073)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 12074)
5@@ -726,13 +726,7 @@
6 ./python/python-binding.h\
7 ./python/io/WritePythonData.cpp\
8 ./python/io/CheckNumPythonArguments.cpp\
9- ./python/io/FetchPythonData.cpp\
10- ./python/objects/Bamg/BamgGeom.h\
11- ./python/objects/Bamg/BamgGeom.cpp\
12- ./python/objects/Bamg/BamgMesh.h\
13- ./python/objects/Bamg/BamgMesh.cpp\
14- ./python/objects/Bamg/BamgOpts.h\
15- ./python/objects/Bamg/BamgOpts.cpp
16+ ./python/io/FetchPythonData.cpp
17
18 #}}}
19 #Matlab sources {{{1
20@@ -934,8 +928,10 @@
21 if PYTHON
22 libISSMPython_a_SOURCES = $(python_sources)
23 libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
24+if PYTHON3
25 libISSMPython_a_CXXFLAGS+= -DNPY_NO_DEPRECATED_API
26 endif
27+endif
28
29 if MATLAB
30 libISSMMatlab_a_SOURCES = $(matlab_sources)
Note: See TracBrowser for help on using the repository browser.