Changeset 19054


Ignore:
Timestamp:
01/29/15 13:25:05 (10 years ago)
Author:
Mathieu Morlighem
Message:

BUG: need to comment out AUTOMAKE_OPTIONS = subdir-objects otherwise there is a mix up with the mex modules on murdo

Location:
issm/trunk-jpl/src/wrappers/python
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/wrappers/python/Makefile.am

    r19047 r19054  
    11AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @AMPIINCL@
    2 AUTOMAKE_OPTIONS = subdir-objects
     2#AUTOMAKE_OPTIONS = subdir-objects
    33
    44EXEEXT=$(PYTHONWRAPPEREXT)

  • issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h

    r16230 r19054  
    1515/* MODULEBOOT/MODULEEND {{{*/
    1616
    17 /*The following macros hide the error exception handling in a matlab module. Just put
     17/*The following macros hide the error exception handling in a python module. Just put
    1818 * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions
    1919 * will be trapped*/
Note: See TracChangeset for help on using the changeset viewer.