Changeset 14310 for issm/trunk/src/wrappers/matlab/Makefile.am

Timestamp:

02/04/13 08:01:04 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 14308

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wrappers/matlab/Makefile.am (modified) (4 diffs)

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

@@ -48 +48 @@
                                                  ElementConnectivity.la\
                                                  EnumToString.la\
+                                                 ExpSimplify.la\
                                                  HoleFiller.la\
                                                  InternalFront.la\
@@ -76 +77 @@
                                    KMLMeshWrite.la\
                                    KMLOverlay.la\
-                                   Shp2Kml.la\
                                    Exp2Kml.la\
-                                   Kml2Exp.la
+                                   Kml2Exp.la\
+                                   Shp2Exp.la\
+                                   Shp2Kml.la
 endif
 endif 
@@ -210 +212 @@
 Ll2xy_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
+ExpSimplify_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp\
+                                                        ../ExpSimplify/ExpSimplify.h
+ExpSimplify_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
+
 Exp2Kml_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
                                                         ../Exp2Kml/Exp2Kml.h
@@ -246 +252 @@
 Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB)
 
+Shp2Exp_la_SOURCES = ../Shp2Exp/Shp2Exp.cpp\
+                                                        ../Shp2Exp/Shp2Exp.h
+Shp2Exp_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB)
+
 Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
                                                         ../Shp2Kml/Shp2Kml.h