Changeset 12023 for issm/trunk-jpl/src/mex/Makefile.am

Timestamp:

04/17/12 07:58:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed library conflict (order should be checked)

File:

• issm/trunk-jpl/src/mex/Makefile.am (modified) (3 diffs)

issm/trunk-jpl/src/mex/Makefile.am

@@ -2 +2 @@
 EXEEXT=$(WRAPPEREXT)
 #Bin programs {{{1
-
 if MODULES
 if MATLAB
@@ -54 +53 @@
 
 if MATLAB
-AM_LDFLAGS  = $(MEXLINK)
+AM_LDFLAGS   = $(MEXLINK)
 AM_CXXFLAGS +=  -D_HAVE_MATLAB_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 
-LDADD       += $(MEXLIB) ../c/libISSMMatlab.a
-
+LDADD       += $(MEXLIB) ../c/libISSMMatlab.a 
 endif
 
 if PYTHON
-AM_LDFLAGS  = $(PYTHONLINK)
+AM_LDFLAGS   = $(PYTHONLINK)
 AM_CXXFLAGS +=  -D_HAVE_PYTHON_ -DNPY_NO_DEPRECATED_API 
 LDADD       += $(BOOSTLIB) $(PYTHONLIB) ../c/libISSMPython.a
 endif
 
+LDADD       += ../c/libISSMCore.a ../c/libISSMModules.a 
 
 #Optimization flags:
@@ -178 +177 @@
 TriMeshRefine_SOURCES = TriMeshRefine/TriMeshRefine.cpp\
                           TriMeshRefine/TriMeshRefine.h
-
 #}}}