Changeset 11846

Timestamp:

04/01/12 11:25:04 (13 years ago)

Author:

Eric.Larour

Message:

Independent compilation between Python and Matlab

File:

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

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

@@ -1 @@
-INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ 
-EXEEXT=$(MEXEXT)
-
+INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@  @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
+EXEEXT=$(WRAPPEREXT)
 #Bin programs {{{1
+
 if NOSERIAL
 bin_PROGRAMS = 
 else
+if MATLAB
 bin_PROGRAMS = AverageFilter\
                                 AddExternalResult\
@@ -88 +89 @@
                                 UpdateDynamicConstraints\
                                 VerticesDof
-
+endif
+if PYTHON
+bin_PROGRAMS = Test
+endif
 endif 
 #}}}
@@ -96 +100 @@
 else
 if DAKOTA
+if MATLAB
 bin_PROGRAMS += DakotaResponses\
                                 Dakota\
                                 InputUpdateFromDakota
-else
-bin_PROGRAMS += 
+endif 
+endif 
 endif
-endif 
 #}}}
 #Flags and libraries {{{1
-LDADD =   $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(MEXLIB) $(GSLLIB)
-
+LDADD =   $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
+
+#Initialize
+AM_CXXFLAGS =
+
+if MATLAB
 AM_LDFLAGS = $(MEXLINK)
-
-#Matlab
 AM_CXXFLAGS=  -DMATLAB  -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 
-
-#Triangle library
-AM_CXXFLAGS+=  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
-
+LDADD +=   $(MEXLIB) 
 
 #64 vs 32 bits
@@ -122 +125 @@
 AM_CXXFLAGS += -DMX_COMPAT_32 -D_SERIAL_
 endif
-
+endif 
+
+#Triangle library
+AM_CXXFLAGS+=  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
+
+#Optimization flags:
 AM_CXXFLAGS += $(CXXOPTFLAGS) 
 
@@ -334 +342 @@
 SurfaceArea_SOURCES = SurfaceArea/SurfaceArea.cpp\
                                                                  SurfaceArea/SurfaceArea.h
+
+Test_SOURCES = Test/Test.cpp\
+                          Test/Test.h
 
 TimeAdapt_SOURCES = TimeAdapt/TimeAdapt.cpp\