Changeset 11995 for issm/trunk/externalpackages/metis/configs/4.0/altix64/Makefile.in.patch

Timestamp:

04/16/12 14:57:18 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

issm/trunk

Files:

• . (modified) (2 props)
• externalpackages/metis/configs/4.0/altix64/Makefile.in.patch (modified) (1 diff)

issm/trunk

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

issm/trunk/externalpackages/metis/configs/4.0/altix64/Makefile.in.patch

@@ -1 @@
-3,5c3
-< CC = gcc
-< OBJ_EXT=o
-< LIB_EXT=a
+3c3,5
+< CC = cc
 ---
-> CC = cc
-8c6
-< OPTFLAGS = -DLINUX -fPIC
+> CC = gcc
+> OBJ_EXT=o
+> LIB_EXT=a
+6c8
+< OPTFLAGS = -O2 
 ---
-> OPTFLAGS = -O2 
+> OPTFLAGS = -DLINUX -fPIC

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in