Changeset 13975 for issm/trunk/configure.ac

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• configure.ac (modified) (2 diffs)

issm/trunk/configure.ac

@@ -2 +2 @@
 
 #AUTOCONF
-AC_INIT([ISSM],[4.2.2],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure
+AC_INIT([ISSM],[4.2.3],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure
 AC_CONFIG_AUX_DIR([./aux-config])         #Put config files in aux-config
 AC_CONFIG_MACRO_DIR([m4])                 #m4 macros are located in m4
@@ -36 +36 @@
                         src/Makefile
                         src/c/Makefile 
-                        src/modules/Makefile
-                        src/modules/python/Makefile
-                        src/modules/matlab/Makefile
+                        src/wrappers/Makefile
+                        src/wrappers/python/Makefile
+                        src/wrappers/matlab/Makefile
+                        src/android/Makefile
+                        src/android/ISSM/Makefile
                         src/m/Makefile])