Changeset 9759

Timestamp:

09/10/11 09:48:11 (14 years ago)

Author:

Eric.Larour

Message:

Switched Dakota sources from library compilation to conditional compilation into the libpISSM.a library
Reason is that CreateQmuParameters creates a symbolic circular dependency problem.

File:

• issm/trunk/src/ad/Makefile.am (modified) (5 diffs)

issm/trunk/src/ad/Makefile.am

@@ -16 +16 @@
 if AD
 lib_LIBRARIES += libAD.a 
-endif
-
-if DAKOTA
-lib_LIBRARIES += libDAKOTA.a
 endif
 
@@ -548 +544 @@
 endif
 #}}}
-#DAKOTA library  {{{1
+#DAKOTA sources  {{{1
 
 if DAKOTA
-libDAKOTA_a_SOURCES = ./objects/DakotaPlugin.h\
+libpISSM_a_SOURCES +=  ./objects/DakotaPlugin.h\
                                           ./objects/DakotaPlugin.cpp\
                                           ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\
@@ -561 +557 @@
                                           ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
                                           ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
-                                          ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\
                                           ./modules/Dakotax/Dakotax.h\
                                           ./modules/Dakotax/Dakotax.cpp\
@@ -570 +565 @@
                                           ./modules/Dakotax/DescriptorIndex.cpp\
                                           ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
+                                          ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\
                                           ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h
-
 
 libDAKOTA_a_CXXFLAGS = -fPIC -D_PARALLEL_   -D_C_ $(CXXOPTFLAGS)
@@ -592 +587 @@
 endif
 
-if DAKOTA
-LDADD +=    ./libDAKOTA.a ./libpISSM.a 
-endif
-
 #External packages
 LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADICLIB)