From 92ec9b8e2f069406cad40d9466bf449cac0e3dee Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Thu, 19 Nov 2009 21:45:15 +0100 Subject: Fixed NAR-108 and NAR-110 --- .../org/apache/maven/plugin/nar/aol.properties | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/resources/org/apache/maven/plugin/nar/aol.properties b/src/main/resources/org/apache/maven/plugin/nar/aol.properties index 49ab264..636b572 100644 --- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties +++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties @@ -43,7 +43,7 @@ x86.Windows.msvc.c.excludes= x86.Windows.msvc.fortran.compiler=df x86.Windows.msvc.fortran.defines=Windows WIN32 x86.Windows.msvc.fortran.options= -x86.Windows.msvc.fortran.includes=**/*.f **/*.for +x86.Windows.msvc.fortran.includes=**/*.f **/*.for **/*.f90 x86.Windows.msvc.fortran.excludes= x86.Windows.msvc.java.include=include;include/win32 @@ -79,7 +79,7 @@ amd64.Windows.msvc.c.excludes= amd64.Windows.msvc.fortran.compiler=df amd64.Windows.msvc.fortran.defines=Windows WIN32 amd64.Windows.msvc.fortran.options= -amd64.Windows.msvc.fortran.includes=**/*.f **/*.for +amd64.Windows.msvc.fortran.includes=**/*.f **/*.for **/*.f90 amd64.Windows.msvc.fortran.excludes= amd64.Windows.msvc.java.include=include;include/win32 @@ -110,10 +110,10 @@ x86.Windows.g++.c.options=-Wall x86.Windows.g++.c.includes=**/*.c x86.Windows.g++.c.excludes= -x86.Windows.g++.fortran.compiler=g77 +x86.Windows.g++.fortran.compiler=gfortran x86.Windows.g++.fortran.defines=Windows x86.Windows.g++.fortran.options=-Wall -x86.Windows.g++.fortran.includes=**/*.f **/*.for +x86.Windows.g++.fortran.includes=**/*.f **/*.for **/*.f90 x86.Windows.g++.fortran.excludes= x86.Windows.g++.java.include=include;include/win32 @@ -139,21 +139,21 @@ x86.Windows.gcc.jni.extension=dll i386.Linux.linker=g++ i386.Linux.g++.cpp.compiler=g++ -i386.Linux.g++.cpp.defines=Linux GNU_GCC f2cFortran +i386.Linux.g++.cpp.defines=Linux GNU_GCC i386.Linux.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion i386.Linux.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx i386.Linux.g++.cpp.excludes= i386.Linux.g++.c.compiler=gcc -i386.Linux.g++.c.defines=Linux GNU_GCC f2cFortran +i386.Linux.g++.c.defines=Linux GNU_GCC i386.Linux.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion i386.Linux.g++.c.includes=**/*.c i386.Linux.g++.c.excludes= -i386.Linux.g++.fortran.compiler=g77 -i386.Linux.g++.fortran.defines=Linux GNU_GCC f2cFortran +i386.Linux.g++.fortran.compiler=gfortran +i386.Linux.g++.fortran.defines=Linux GNU_GCC i386.Linux.g++.fortran.options=-Wall -i386.Linux.g++.fortran.includes=**/*.f **/*.for +i386.Linux.g++.fortran.includes=**/*.f **/*.for **/*.f90 i386.Linux.g++.fortran.excludes= i386.Linux.g++.java.include=include;include/linux @@ -193,7 +193,7 @@ i386.Linux.icc.c.excludes= i386.Linux.icc.fortran.compiler=ifort i386.Linux.icc.fortran.defines=Linux i386.Linux.icc.fortran.options= -i386.Linux.icc.fortran.includes=**/*.f **/*.for +i386.Linux.icc.fortran.includes=**/*.f **/*.for **/*.f90 i386.Linux.icc.fortran.excludes= i386.Linux.icc.java.include=include;include/linux @@ -226,7 +226,7 @@ i386.Linux.icpc.c.excludes= i386.Linux.icpc.fortran.compiler=ifort i386.Linux.icpc.fortran.defines=Linux i386.Linux.icpc.fortran.options= -i386.Linux.icpc.fortran.includes=**/*.f **/*.for +i386.Linux.icpc.fortran.includes=**/*.f **/*.for **/*.f90 i386.Linux.icpc.fortran.excludes= i386.Linux.icpc.java.include=include;include/linux @@ -259,7 +259,7 @@ i386.Linux.ecc.c.excludes= i386.Linux.ecc.fortran.compiler=ifort i386.Linux.ecc.fortran.defines=Linux i386.Linux.ecc.fortran.options= -i386.Linux.ecc.fortran.includes=**/*.f **/*.for +i386.Linux.ecc.fortran.includes=**/*.f **/*.for **/*.f90 i386.Linux.ecc.fortran.excludes= i386.Linux.ecc.java.include=include;include/linux @@ -292,7 +292,7 @@ i386.Linux.ecpc.c.excludes= i386.Linux.ecpc.fortran.compiler=ifort i386.Linux.ecpc.fortran.defines=Linux i386.Linux.ecpc.fortran.options= -i386.Linux.ecpc.fortran.includes=**/*.f **/*.for +i386.Linux.ecpc.fortran.includes=**/*.f **/*.for **/*.f90 i386.Linux.ecpc.fortran.excludes= i386.Linux.ecpc.java.include=include;include/linux @@ -312,21 +312,21 @@ i386.Linux.ecpc.executable.extension= amd64.Linux.linker=g++ amd64.Linux.g++.cpp.compiler=g++ -amd64.Linux.g++.cpp.defines=Linux GNU_GCC f2cFortran +amd64.Linux.g++.cpp.defines=Linux GNU_GCC amd64.Linux.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC amd64.Linux.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx amd64.Linux.g++.cpp.excludes= amd64.Linux.g++.c.compiler=gcc -amd64.Linux.g++.c.defines=Linux GNU_GCC f2cFortran +amd64.Linux.g++.c.defines=Linux GNU_GCC amd64.Linux.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC amd64.Linux.g++.c.includes=**/*.c amd64.Linux.g++.c.excludes= -amd64.Linux.g++.fortran.compiler=g77 -amd64.Linux.g++.fortran.defines=Linux GNU_GCC f2cFortran +amd64.Linux.g++.fortran.compiler=gfortran +amd64.Linux.g++.fortran.defines=Linux GNU_GCC amd64.Linux.g++.fortran.options=-Wall -amd64.Linux.g++.fortran.includes=**/*.f **/*.for +amd64.Linux.g++.fortran.includes=**/*.f **/*.for **/*.f90 amd64.Linux.g++.fortran.excludes= amd64.Linux.g++.java.include=include;include/linux @@ -354,21 +354,21 @@ amd64.Linux.gcc.jni.extension=so ppc.MacOSX.linker=g++ ppc.MacOSX.g++.cpp.compiler=g++ -ppc.MacOSX.g++.cpp.defines=Darwin GNU_GCC f2cFortran +ppc.MacOSX.g++.cpp.defines=Darwin GNU_GCC ppc.MacOSX.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion ppc.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx ppc.MacOSX.g++.cpp.excludes= ppc.MacOSX.g++.c.compiler=gcc -ppc.MacOSX.g++.c.defines=Darwin GNU_GCC f2cFortran +ppc.MacOSX.g++.c.defines=Darwin GNU_GCC ppc.MacOSX.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion ppc.MacOSX.g++.c.includes=**/*.c ppc.MacOSX.g++.c.excludes= -ppc.MacOSX.g++.fortran.compiler=g77 +ppc.MacOSX.g++.fortran.compiler=gfortran ppc.MacOSX.g++.fortran.defines=Darwin GNU_GCC ppc.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore -ppc.MacOSX.g++.fortran.includes=**/*.f **/*.for +ppc.MacOSX.g++.fortran.includes=**/*.f **/*.for **/*.f90 ppc.MacOSX.g++.fortran.excludes= ppc.MacOSX.g++.java.include=include @@ -410,7 +410,7 @@ i386.MacOSX.g++.c.excludes= i386.MacOSX.g++.fortran.compiler=gfortran i386.MacOSX.g++.fortran.defines=Darwin GNU_GCC i386.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore -i386.MacOSX.g++.fortran.includes=**/*.f **/*.for +i386.MacOSX.g++.fortran.includes=**/*.f **/*.for **/*.f90 i386.MacOSX.g++.fortran.excludes= i386.MacOSX.g++.java.include=include @@ -452,7 +452,7 @@ x86_64.MacOSX.g++.c.excludes= x86_64.MacOSX.g++.fortran.compiler=gfortran x86_64.MacOSX.g++.fortran.defines=Darwin GNU_GCC x86_64.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore -x86_64.MacOSX.g++.fortran.includes=**/*.f **/*.for +x86_64.MacOSX.g++.fortran.includes=**/*.f **/*.for **/*.f90 x86_64.MacOSX.g++.fortran.excludes= x86_64.MacOSX.g++.java.include=include @@ -491,10 +491,10 @@ sparc.SunOS.CC.c.options= sparc.SunOS.CC.c.includes=**/*.c sparc.SunOS.CC.c.excludes= -sparc.SunOS.CC.fortran.compiler=sunf77 +sparc.SunOS.CC.fortran.compiler=sunf90 sparc.SunOS.CC.fortran.defines=SOLARIS2 sparc.SunOS.CC.fortran.options= -sparc.SunOS.CC.fortran.includes=**/*.f **/*.for +sparc.SunOS.CC.fortran.includes=**/*.f **/*.for **/*.f90 sparc.SunOS.CC.fortran.excludes= sparc.SunOS.CC.java.include=include;include/solaris -- cgit v1.2.3