Changeset 11460

Timestamp:

02/16/12 16:36:33 (13 years ago)

Author:

Eric.Larour

Message:

Renamed executable in Makefile.am form issm.exe to issm, because autotools should pick up the extension. Also added isnan function from serial to core routines

File:

• issm/trunk-jpl/src/c/Makefile.am (modified) (4 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -185 +185 @@
                                         ./shared/Numerics/GaussPoints.cpp\
                                         ./shared/Numerics/cross.cpp\
+                                        ./shared/Numerics/isnan.h\
+                                        ./shared/Numerics/isnan.cpp\
                                         ./shared/Numerics/extrema.cpp\
                                         ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\
@@ -743 +745 @@
                         ./shared/Threads/LaunchThread.cpp\
                         ./shared/Threads/PartitionRange.cpp\
-                        ./shared/Numerics/isnan.h\
-                        ./shared/Numerics/isnan.cpp\
                         ./shared/Exp/exp.h\
                         ./shared/Exp/IsInPoly.cpp\
@@ -915 +915 @@
 bin_PROGRAMS = 
 else 
-bin_PROGRAMS = issm.exe
+bin_PROGRAMS = issm
 endif
 
@@ -922 +922 @@
 
 #External packages
-LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB) 
-
-issm_exe_SOURCES = solutions/issm.cpp
-issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_  $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
-#}}}
+LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB)  $(OSLIBS)
+
+issm_SOURCES = solutions/issm.cpp
+issm_CXXFLAGS= -fPIC -D_PARALLEL_  $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+#}}}