Changeset 15270

Timestamp:

06/13/13 22:13:02 (12 years ago)

Author:

glperez

Message:

CHG: Changed the order of our libraries. Fixed compilation issue.

File:

• issm/trunk-jpl/src/wrappers/matlab/Makefile.am (modified) (1 diff)

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

@@ -122 +122 @@
 deps += ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la ./libISSMMatlab.a
 else
-#if WINDOWS
-#AM_LDFLAGS += -Wl,../../c/libISSMCore.a -Wl,./libISSMApi.a -Wl,../../c/libISSMModules.a -Wl,./libISSMMatlab.a
-#else
-deps += ${OS_LDFLAG}../../c/libISSMModules.a ${OS_LDFLAG}../../c/libISSMCore.a ${OS_LDFLAG}./libISSMApi.a ${OS_LDFLAG}./libISSMMatlab.a
-#endif
+deps += ${OS_LDFLAG}./libISSMMatlab.a ${OS_LDFLAG}../../c/libISSMModules.a ${OS_LDFLAG}../../c/libISSMCore.a ${OS_LDFLAG}./libISSMApi.a
 if ADOLC
 deps += $(ADOLCLIB)