Changeset 13743

Timestamp:

10/18/12 16:13:31 (12 years ago)

Author:

seroussi

Message:

BUG: reverting to previous ordering

Location:

issm/trunk-jpl/src/wrappers

Files:

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

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

@@ -49 +49 @@
 #}}}
 #Flags and libraries {{{
-if SHAREDLIBS
-deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
-else
-deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
-endif
-if ADOLC
-deps += $(ADOLCLIB)
-endif
-deps +=  $(MATHLIB) ${MEXLIB}
+#if SHAREDLIBS
+#deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+#else
+#deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
+#endif
+#deps +=  $(MATHLIB) ${MEXLIB}
+deps =  $(MATHLIB) ${MEXLIB}
 
 #Triangle library
@@ -78 +76 @@
 AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 
 
+if SHAREDLIBS
+deps +=
+else
+deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a  
+if ADOLC
+deps += $(ADOLCLIB)
+endif
+endif
 #Optimization flags:
 AM_CXXFLAGS += $(CXXOPTFLAGS) 

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

@@ -19 +19 @@
 #}}}
 #Flags and libraries {{{
-if SHAREDLIBS
-deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
-else
-deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
-endif
-
-deps +=  $(MATHLIB) ${PYTHONLIB}
+#if SHAREDLIBS
+#deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+#else
+#deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
+#endif
+#deps +=  $(MATHLIB) ${PYTHONLIB}
+deps =  $(MATHLIB) ${PYTHONLIB}
 
 #Triangle library
@@ -48 +48 @@
 AM_CXXFLAGS +=  -DNPY_NO_DEPRECATED_API 
 endif
+
+if SHAREDLIBS            
+deps +=                  
+else             
+deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a                  
+endif 
 
 #Optimization flags: