Changeset 12413

Timestamp:

06/13/12 12:18:09 (13 years ago)

Author:

Mathieu Morlighem

Message:

Switch off kriging compilation if --without-kriging

File:

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

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

@@ -3 +3 @@
 EXEEXT=$(ISSMEXT)
 
-#Library declaration {{{1
+#Library declaration {{{
 lib_LIBRARIES = libISSMCore.a libISSMOverload.a
 if PYTHON
@@ -17 +17 @@
 
 #sources
-#Core sources{{{1
+#Core sources{{{
 core_sources = ./issm.h\
                                         ./issm-binding.h\
@@ -342 +342 @@
 
 #}}}
-#DAKOTA sources  {{{1
+#DAKOTA sources  {{{
 dakota_sources = ./objects/DakotaPlugin.h\
                                           ./objects/DakotaPlugin.cpp\
@@ -366 +366 @@
                                           ./modules/Dakotax/SpawnCoreParallel.cpp
 #}}}
-#Transient sources  {{{1
+#Transient sources  {{{
 transient_sources  = ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \
                                          ./solutions/transient_core.cpp
 #}}}
-#Steadystate sources  {{{1
+#Steadystate sources  {{{
 steadystate_sources = ./solutions/steadystate_core.cpp\
                                           ./solutions/steadystateconvergence.cpp
 #}}}
-#Prognostic sources  {{{1
+#Prognostic sources  {{{
 prognostic_sources = ./modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp\
                                               ./modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp\
@@ -381 +381 @@
                                                   ./solutions/prognostic_core.cpp
 #}}}
-#Thermal sources  {{{1
+#Thermal sources  {{{
 thermal_sources = ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\
                                            ./modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp\
@@ -401 +401 @@
                                            ./solvers/solver_thermal_nonlinear.cpp
 #}}}
-#Control sources  {{{1
+#Control sources  {{{
 control_sources= ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp\
                                           ./modules/ControlInputGetGradientx/ControlInputGetGradientx.h\
@@ -456 +456 @@
 
 #}}}
-#Hydrology sources  {{{1
+#Hydrology sources  {{{
 hydrology_sources  = ./modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp\
                                               ./modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp\
@@ -464 +464 @@
                                                   ./solutions/hydrology_core_step.cpp 
 #}}}
-#Diagnostic sources  {{{1
+#Diagnostic sources  {{{
 diagnostic_sources = ./modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp\
                                               ./modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp \
@@ -485 +485 @@
                                                   ./solvers/solver_stokescoupling_nonlinear.cpp
 #}}}
-#Balanced sources  {{{1
+#Balanced sources  {{{
 balanced_sources = ./modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp\
                                             ./modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp\
@@ -492 +492 @@
                                                 ./solutions/balancethickness_core.cpp
 #}}}
-#Responses sources  {{{1
+#Responses sources  {{{
 responses_sources = ./modules/MinVelx/MinVelx.h\
                                              ./modules/MinVelx/MinVelx.cpp\
@@ -522 +522 @@
                                              ./modules/MassFluxx/MassFluxx.h
 #}}}
-#Slope sources  {{{1
+#Slope sources  {{{
 slope_sources =  ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\
                                           ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \
@@ -534 +534 @@
                                           ./solutions/bedslope_core.cpp
 #}}}
-#Groundingline sources  {{{1
+#Groundingline sources  {{{
 groundingline_sources= ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\
                                                 ./modules/GroundinglineMigrationx/GroundinglineMigrationx.h
 #}}}
-#Rifts sources  {{{1
+#Rifts sources  {{{
 rifts_sources = ./objects/Loads/Riftfront.cpp\
                                     ./objects/Loads/Riftfront.h\
                                     ./modules/ConstraintsStatex/RiftConstraintsState.cpp
 #}}}
-#3D sources  {{{1
+#3D sources  {{{
 threed_sources = ./objects/Gauss/GaussPenta.h\
                                      ./objects/Gauss/GaussPenta.cpp\
@@ -557 +557 @@
                                      ./objects/Elements/PentaRef.cpp
 #}}}
-#Bamg sources  {{{1
+#Bamg sources  {{{
 bamg_sources =  ./objects/Bamg/BamgGeom.h\
                                 ./objects/Bamg/BamgGeom.cpp\
@@ -623 +623 @@
                                 ./modules/BamgTriangulatex/BamgTriangulatex.h
 #}}}
-#Kriging sources  {{{1
+#Kriging sources  {{{
 kriging_sources = ./Container/Observations.h\
                                                 ./Container/Observations.cpp\
@@ -662 +662 @@
 
 #}}}
-#Kml sources  {{{1
+#Kml sources  {{{
 kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.h\
                              ./modules/Exp2Kmlx/Exp2Kmlx.cpp\
@@ -730 +730 @@
                              ./objects/KML/KMLFileReadUtils.h
 #}}}
-#Petsc sources  {{{1
+#Petsc sources  {{{
 petsc_sources= ./toolkits/petsc\
                                         ./toolkits/petsc/patches\
@@ -765 +765 @@
 
 #}}}
-#Gsl sources  {{{1
+#Gsl sources  {{{
 gsl_sources= ./modules/Solverx/SolverxGsl.cpp
 
 #}}}
-#Mpi sources  {{{1
+#Mpi sources  {{{
 mpi_sources= ./toolkits/mpi/mpiincludes.h\
                                 ./toolkits/mpi/patches/mpipatches.h\
@@ -777 +777 @@
                                 ./toolkits/mpi/patches/MPI_Boundariesfromrange.cpp
 #}}}
-#Metis sources  {{{1
+#Metis sources  {{{
 metis_sources= ./toolkits/metis/patches/metispatches.h\
                                         ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
 #}}}
-#Python sources  {{{1
+#Python sources  {{{
 python_sources=     ./python/io/pythonio.h\
                                         ./python/python-binding.h\
@@ -789 +789 @@
 
 #}}}
-#Matlab sources  {{{1
+#Matlab sources  {{{
 matlab_sources= ./toolkits/matlab/matlabincludes.h\
                                     ./matlab/matlab-binding.h\
@@ -806 +806 @@
                                          ./matlab/io/MatlabVectorToSeqVec.cpp
 #}}}
-#Matlab and Petsc sources  {{{1
+#Matlab and Petsc sources  {{{
 matlabpetsc_sources= ./matlab/io/MatlabMatrixToPetscMatrix.cpp\
                                          ./matlab/io/MatlabVectorToPetscVector.cpp
         
 #}}}
-#Modules sources{{{1
+#Modules sources{{{
 module_sources= ./objects/Options/Option.cpp\
                         ./objects/Options/Option.h\
@@ -899 +899 @@
 #}}}
 
-#{{{1 Conditional build-up of sources
+#{{{ Conditional build-up of sources
 #ISSM sources are a combination of core sources and sources related to specific capabilities (which can 
 #be activated by autotools conditionals 
-
 
 #First the core
@@ -986 +985 @@
 endif
 
-
-#}}}
-#Library flags and sources {{{1
+if KRIGING
+issm_sources +=  $(pkriging_sources)
+endif
+#}}}
+#Library flags and sources {{{
 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS) 
 
 libISSMCore_a_SOURCES  = $(issm_sources)
-libISSMCore_a_SOURCES += $(pkriging_sources)
 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
 
@@ -1014 +1014 @@
 
 #}}}
-#Overload library, to overload any non-standard symbols. {{{1
+#Overload library, to overload any non-standard symbols. {{{
 libISSMOverload_a_SOURCES = ./shared/String/stricmp.c
 libISSMOverload_a_CFLAGS  = -fPIC -D_C_ $(COPTFLAGS) $(CFLAGS)
 #}}}
 
-#Executable {{{1
+#Executable {{{
 bin_PROGRAMS = issm 
 
@@ -1035 +1035 @@
 issm_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 
+if KRIGING
 bin_PROGRAMS += kriging
 kriging_SOURCES = solutions/kriging.cpp
 kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+endif
 #}}}
 #Automatic differentiation: append this fold to the end of the src/c/Makefile.am to get this Makefile.am {{{