Changeset 13739

Timestamp:

10/18/12 14:19:13 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed deps += ../../c/libISSMWrappers.a that was there twice, causing the compilation on mac to be extremely slow.
I was getting the following warning:
"copying selected object files to avoid basename conflicts"

Location:

issm/trunk-jpl/src/wrappers

Files:

• matlab/Makefile.am (modified) (2 diffs)
• python/Makefile.am (modified) (1 diff)

issm/trunk-jpl/src/wrappers/matlab/Makefile.am ¶

@@ -54 +54 @@
 deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
 endif
-
+if ADOLC
+deps += $(ADOLCLIB)
+endif
 deps +=  $(MATHLIB) ${MEXLIB}
-
-#$(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB) 
 
 #Triangle library
@@ -77 +77 @@
 
 AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 
-
-######################################################################################
-# Circular dependencies may not be necessary here.
-#deps += ../../c/libISSMCore.a 
-#if CIRCULAR_DEPENDENCIES
-#deps += $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
-#endif
-######################################################################################
-
-if SHAREDLIBS
-deps +=
-else
-deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a  
-if ADOLC
-deps += $(ADOLCLIB)
-endif
-endif
 
 #Optimization flags:

issm/trunk-jpl/src/wrappers/python/Makefile.am ¶

@@ -49 +49 @@
 endif
 
-if SHAREDLIBS
-deps +=
-else
-deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a
-endif
-
 #Optimization flags:
 AM_CXXFLAGS += $(CXXOPTFLAGS)