Index: /issm/trunk-jpl/configure.ac =================================================================== --- /issm/trunk-jpl/configure.ac (revision 11862) +++ /issm/trunk-jpl/configure.ac (revision 11863) @@ -7,7 +7,7 @@ AM_SILENT_RULES([yes]) AC_PROG_RANLIB -AC_PROG_CC([cccl cl gcc icl cl]) +AC_PROG_CC([cccl cl icl gcc]) AC_PROG_CPP -AC_PROG_CXX([cccl cl g++ icl]) +AC_PROG_CXX([cccl cl icl g++]) AC_PROG_F77([ifort g77 gfortran]) AC_F77_LIBRARY_LDFLAGS @@ -21,53 +21,4 @@ src/mex/Makefile src/m/Makefile - src/m/classes/Makefile - src/m/classes/@modellist/Makefile - src/m/classes/@pairoptions/Makefile - src/m/classes/model/Makefile - src/m/classes/clusters/Makefile - src/m/enum/Makefile - src/m/kml/Makefile - src/m/model/Makefile - src/m/model/plot/Makefile - src/m/model/mesh/Makefile - src/m/model/display/Makefile - src/m/model/parameterization/Makefile - src/m/model/partition/Makefile - src/m/model/solvers/Makefile - src/m/planet/Makefile - src/m/qmu/Makefile - src/m/shared/Makefile - src/m/solutions/Makefile - src/m/solvers/Makefile - src/m/utils/Makefile - src/m/utils/Analysis/Makefile - src/m/utils/Array/Makefile - src/m/utils/BC/Makefile - src/m/utils/Basins/Makefile - src/m/utils/Cluster/Makefile - src/m/utils/DataProcessing/Makefile - src/m/utils/Ecco3/Makefile - src/m/utils/Exp/Makefile - src/m/utils/Exp/manipulation/Makefile - src/m/utils/Exp/readwrite/Makefile - src/m/utils/Geometry/Makefile - src/m/utils/ImageProcessing/Makefile - src/m/utils/Interp/Makefile - src/m/utils/Kml/Makefile - src/m/utils/LatLong/Makefile - src/m/utils/Math/Makefile - src/m/utils/Meca/Makefile - src/m/utils/Mesh/Makefile - src/m/utils/Miscellaneous/Makefile - src/m/utils/Model/Makefile - src/m/utils/Numerics/Makefile - src/m/utils/OS/Makefile - src/m/utils/Plot/Makefile - src/m/utils/Shell/Makefile - src/m/utils/String/Makefile - src/m/utils/consistency/Makefile - src/m/utils/qmu/Makefile bin/Makefile]) AC_OUTPUT - - Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 11862) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 11863) @@ -929,9 +929,4 @@ libISSM_a_CXXFLAGS = -fPIC -DMATLAB -D_SERIAL_ -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ $(CXXFLAGS) $(CXXOPTFLAGS) -if LARGEARRAYS -libISSM_a_CXXFLAGS += -D__GCC4BUILD__ -else -libISSM_a_CXXFLAGS += -DMX_COMPAT_32 -endif endif #}}} Index: /issm/trunk-jpl/src/m/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/Makefile.am (revision 11862) +++ /issm/trunk-jpl/src/m/Makefile.am (revision 11863) @@ -1,1 +1,51 @@ -SUBDIRS = classes enum kml model planet qmu shared solutions solvers utils +bin_SCRIPTS=./classes/*.m \ + ./classes/model/*.m \ + ./classes/clusters/*.m \ + ./enum/*.m \ + ./kml/*.m \ + ./model/*.m \ + ./model/plot/*.m \ + ./model/mesh/*.m \ + ./model/display/*.m \ + ./model/parameterization/*.m \ + ./model/partition/*.m \ + ./model/solvers/*.m \ + ./planet/*.m \ + ./qmu/*.m \ + ./shared/*.m \ + ./solutions/*.m \ + ./solvers/*.m \ + ./utils/*.m \ + ./utils/Analysis/*.m \ + ./utils/Array/*.m \ + ./utils/BC/*.m \ + ./utils/Basins/*.m \ + ./utils/Cluster/*.m \ + ./utils/DataProcessing/*.m \ + ./utils/Ecco3/*.m \ + ./utils/Exp/*.m \ + ./utils/Exp/manipulation/*.m \ + ./utils/Exp/readwrite/*.m \ + ./utils/Geometry/*.m \ + ./utils/ImageProcessing/*.m \ + ./utils/Interp/*.m \ + ./utils/Kml/*.m \ + ./utils/LatLong/*.m \ + ./utils/Math/*.m \ + ./utils/Meca/*.m \ + ./utils/Mesh/*.m \ + ./utils/Miscellaneous/*.m \ + ./utils/Model/*.m \ + ./utils/Numerics/*.m \ + ./utils/OS/*.m \ + ./utils/Plot/*.m \ + ./utils/Shell/*.m \ + ./utils/String/*.m \ + ./utils/consistency/*.m \ + ./utils/qmu/*.m + +#Special treatment of old classes +pairoptionsdir=$(bindir)/@pairoptions +pairoptions_DATA=./classes/@pairoptions/*.m +modellistdir=$(bindir)/@modellist +modellist_DATA=./classes/@modellist/*.m Index: sm/trunk-jpl/src/m/classes/@modellist/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/classes/@modellist/Makefile.am (revision 11862) +++ (revision ) @@ -1,2 +1,0 @@ -classesdir=$(bindir)/@modellist -classes_DATA=*.m Index: sm/trunk-jpl/src/m/classes/@pairoptions/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile.am (revision 11862) +++ (revision ) @@ -1,2 +1,0 @@ -classesdir=$(bindir)/@pairoptions -classes_DATA=*.m Index: sm/trunk-jpl/src/m/classes/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/classes/Makefile.am (revision 11862) +++ (revision ) @@ -1,2 +1,0 @@ -SUBDIRS = @pairoptions @modellist model clusters -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/classes/clusters/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/classes/model/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/classes/model/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/enum/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/enum/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/kml/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/kml/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/Makefile.am (revision 11862) +++ (revision ) @@ -1,2 +1,0 @@ -SUBDIRS = plot mesh display parameterization partition solvers -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/display/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/display/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/mesh/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/mesh/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/parameterization/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/parameterization/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/partition/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/partition/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/plot/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/plot/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/model/solvers/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/model/solvers/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/planet/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/planet/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/qmu/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/qmu/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/shared/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/shared/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/solutions/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/solutions/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/solvers/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/solvers/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Analysis/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Analysis/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Array/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Array/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/BC/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/BC/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Basins/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Basins/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Cluster/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Cluster/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/DataProcessing/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Ecco3/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Ecco3/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Exp/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Exp/Makefile.am (revision 11862) +++ (revision ) @@ -1,2 +1,0 @@ -SUBDIRS = manipulation readwrite -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Exp/manipulation/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Exp/manipulation/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Exp/readwrite/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Exp/readwrite/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Geometry/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Geometry/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Interp/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Interp/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Kml/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Kml/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/LatLong/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/LatLong/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Makefile.am (revision 11862) +++ (revision ) @@ -1,2 +1,0 @@ -SUBDIRS = Analysis Array BC Basins Cluster DataProcessing Ecco3 Exp Geometry ImageProcessing Interp Kml LatLong Math Meca Mesh Miscellaneous Model Numerics OS Plot Shell String consistency qmu -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Math/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Math/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Meca/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Meca/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Mesh/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Mesh/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Model/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Model/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Numerics/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Numerics/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/OS/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/OS/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Plot/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Plot/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/Shell/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/Shell/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/String/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/String/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/consistency/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/consistency/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: sm/trunk-jpl/src/m/utils/qmu/Makefile.am =================================================================== --- /issm/trunk-jpl/src/m/utils/qmu/Makefile.am (revision 11862) +++ (revision ) @@ -1,1 +1,0 @@ -bin_SCRIPTS=*.m Index: /issm/trunk-jpl/src/mex/Makefile.am =================================================================== --- /issm/trunk-jpl/src/mex/Makefile.am (revision 11862) +++ /issm/trunk-jpl/src/mex/Makefile.am (revision 11863) @@ -120,9 +120,5 @@ #64 vs 32 bits -if LARGEARRAYS -AM_CXXFLAGS += -D__GCC4BUILD__ -D_SERIAL_ -else AM_CXXFLAGS += -DMX_COMPAT_32 -D_SERIAL_ -endif endif