Changeset 4639 for issm/trunk/src/c/Makefile.am

Timestamp:

07/16/10 17:39:59 (15 years ago)

Author:

Eric.Larour

Message:

New Chacox module

File:

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

issm/trunk/src/c/Makefile.am

@@ -1 @@
-INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@
+INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ 
 
 #Compile serial library, and then try and compile parallel library
@@ -337 +337 @@
                                         ./modules/AddExternalResultx/AddExternalResultx.h\
                                         ./modules/AddExternalResultx/AddExternalResultx.cpp\
+                                        ./modules/Chacox/Chacox.h\
+                                        ./modules/Chacox/Chacox.cpp\
+                                        ./modules/Chacox/input_parse.cpp\
+                                        ./modules/Chacox/chaco_seconds.cpp\
+                                        ./modules/Chacox/user_params.cpp\
                                         ./modules/ModelProcessorx/ModelProcessorx.h\
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp\
@@ -888 +893 @@
                                         ./modules/AddExternalResultx/AddExternalResultx.h\
                                         ./modules/AddExternalResultx/AddExternalResultx.cpp\
+                                        ./modules/Chacox/Chacox.h\
+                                        ./modules/Chacox/Chacox.cpp\
+                                        ./modules/Chacox/input_parse.cpp\
+                                        ./modules/Chacox/chaco_seconds.cpp\
+                                        ./modules/Chacox/user_params.cpp\
                                         ./modules/ModelProcessorx/ModelProcessorx.h\
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp\
@@ -1146 +1156 @@
 endif
 
-LDADD =    ./libpISSM.a $(PETSCLIB)    $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
+LDADD =    ./libpISSM.a $(PETSCLIB)    $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
 
 issm_exe_SOURCES = solutions/issm.cpp