Index: /issm/trunk-jpl/src/modules/python/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/modules/python/Makefile.am	(revision 13173)
+++ /issm/trunk-jpl/src/modules/python/Makefile.am	(revision 13174)
@@ -1,16 +1,24 @@
-AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
+AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
+
 EXEEXT=$(PYTHONWRAPPEREXT)
-#Bin programs {{{1
+
+#Modules {{{1
 if MODULES
-bin_PROGRAMS = ElementConnectivity\
-			   EnumToString\
-			   InterpFromMeshToMesh2d \
-			   NodeConnectivity\
-			   StringToEnum\
-			   TriMesh
+lib_LTLIBRARIES = ElementConnectivity.la\
+			   EnumToString.la\
+			   InterpFromMeshToMesh2d.la\
+			   NodeConnectivity.la\
+			   StringToEnum.la\
+			   TriMesh.la
 endif 
 #}}}
 #Flags and libraries {{{1
-LDADD = ../../c/libISSMCore.a ../../c/libISSMModules.a $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
+if SHAREDLIBS
+deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
+else
+deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
+endif
+
+deps +=  $(MATHLIB) ${MEXLIB}
 
 #Triangle library
@@ -18,12 +26,23 @@
 
 #Python part
-AM_LDFLAGS   = $(PYTHONLINK)
+AM_LDFLAGS   = $(PYTHONLINK) -shrext ${EXEEXT} -module
+if VERSION
+AM_LDFLAGS +=
+else
+AM_LDFLAGS += -avoid-version
+endif
+if SHAREDLIBS
+deps += ../../c/libISSMPython.la 
+else
+deps += ../../c/libISSMPython.a
+AM_LDFLAGS += --no-warnings 
+endif
+
 AM_CXXFLAGS +=  -D_HAVE_PYTHON_MODULES_  -fPIC
 if PYTHON3
 AM_CXXFLAGS +=  -DNPY_NO_DEPRECATED_API 
 endif
-LDADD       += $(BOOSTLIB) $(PYTHONLIB) ../../c/libISSMPython.a
-
-LDADD       += ../../c/libISSMCore.a ../../c/libISSMModules.a 
+#LDADD       = $(BOOSTLIB) $(PYTHONLIB) ../../c/libISSMPython.a
+#LDADD       += ../../c/libISSMCore.a ../../c/libISSMModules.a 
 
 #Optimization flags:
@@ -31,20 +50,26 @@
 #}}}
 #Bin sources {{{1
-ElementConnectivity_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
+ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
 			  ../ElementConnectivity/ElementConnectivity.h
+ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
-EnumToString_SOURCES = ../EnumToString/EnumToString.cpp\
+EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
 			  ../EnumToString/EnumToString.h
+EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
-InterpFromMeshToMesh2d_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
+InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
 							../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
+InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
 
-NodeConnectivity_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
+NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
 										../NodeConnectivity/NodeConnectivity.h
+NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
-StringToEnum_SOURCES = ../StringToEnum/StringToEnum.cpp\
+StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
 			  ../StringToEnum/StringToEnum.h
+StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
-TriMesh_SOURCES = ../TriMesh/TriMesh.cpp\
+TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
 			  ../TriMesh/TriMesh.h
+TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB)
 #}}}
