Changeset 15096

Timestamp:

05/24/13 10:29:34 (12 years ago)

Author:

Eric.Larour

Message:

CHG: resolved cyclical dependency issue

Location:

issm/trunk-jpl/src/wrappers

Files:

• matlab/Makefile.am (modified) (4 diffs)
• matlab/io/ApiPrintf.cpp (added)
• matlab/io/WriteMatlabData.cpp (modified) (1 diff)
• python/Makefile.am (modified) (3 diffs)
• python/io/ApiPrintf.cpp (added)

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

@@ -25 +25 @@
                                 ./io/MatlabMatrixToIssmMat.cpp\
                                 ./io/MatlabVectorToIssmVec.cpp
+
                                 
 if PETSC
@@ -36 +37 @@
 if SHAREDLIBS
 libISSMMatlab_la_SOURCES = $(io_sources)
+endif
+#}}}
+#api io{{{
+lib_LIBRARIES += libISSMApi.a 
+if SHAREDLIBS
+lib_LTLIBRARIES += libISSMApi.la
+else
+lib_LTLIBRARIES +=
+endif
+
+api_sources= ./io/ApiPrintf.cpp
+
+libISSMApi_a_SOURCES = $(api_sources)
+libISSMApi_a_CXXFLAGS= $(ALLCXXFLAGS)
+if SHAREDLIBS
+libISSMApi_la_SOURCES = $(api_sources)
 endif
 #}}}
@@ -104 +121 @@
 AM_LDFLAGS += -avoid-version
 endif
+
 if SHAREDLIBS
 deps += ./libISSMMatlab.la 
@@ -121 +139 @@
 endif
 endif
+
+if SHAREDLIBS
+deps += ./libISSMApi.la 
+else
+deps += ./libISSMApi.a
+endif
+
+
 
 #MEXLIB needs to be the last (undefined references on larsen)

issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp

@@ -488 +488 @@
 }
 /*}}}*/
-
-/*Matlab printf i/o: */
-/*FUNCTION ApiPrintf(char* format, const char* string){{{*/
-void ApiPrintf(char* format,const char* string){
-
-        /*use mexPrintf in matlab: */
-        mexPrintf(format,string);
-        
-        return;
-}
-/*}}}*/

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

@@ -8 +8 @@
 lib_LTLIBRARIES = libISSMPython.la
 else
-        lib_LTLIBRARIES =
+lib_LTLIBRARIES =
 endif
 
@@ -22 +22 @@
 if SHAREDLIBS
 libISSMPython_la_SOURCES = $(io_sources)
+endif
+#}}}
+#api io{{{
+lib_LIBRARIES += libISSMApi.a 
+if SHAREDLIBS
+lib_LTLIBRARIES += libISSMApi.la
+else
+lib_LTLIBRARIES +=
+endif
+
+api_sources= ./io/ApiPrintf.cpp
+
+libISSMApi_a_SOURCES = $(api_sources)
+libISSMApi_a_CXXFLAGS= $(ALLCXXFLAGS)
+if SHAREDLIBS
+libISSMApi_la_SOURCES = $(api_sources)
 endif
 #}}}
@@ -79 +95 @@
 deps += $(ADOLCLIB)
 endif
+
+if SHAREDLIBS
+deps += ./libISSMApi.la 
+else
+deps += ./libISSMApi.a
+endif
+
+
 
 endif