Merge pull request #6 from rmcdermo/master

Build: use targets in make scripts
firemodels · Jul 21, 2016 · 56ae595 · 56ae595
2 parents 3735fa1 + 399c016
commit 56ae595
Show file tree

Hide file tree

Showing 7 changed files with 1,075 additions and 1,044 deletions.
diff --git a/Build/intel_linux_64/make_radcal.sh b/Build/intel_linux_64/make_radcal.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+platform=intel64
+dir=`pwd`
+target=${dir##*/}
+
+source $IFORT_COMPILER/bin/compilervars.sh $platform
+
+echo Building $target
+make -j4 DEBUG=1 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/intel_osx_64/make_radcal.sh b/Build/intel_osx_64/make_radcal.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+platform=intel64
+dir=`pwd`
+target=${dir##*/}
+
+source $IFORT_COMPILER/bin/compilervars.sh $platform
+
+echo Building $target
+make -j4 DEBUG=1 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/intel_osx_64_db/make_radcal.sh b/Build/intel_osx_64_db/make_radcal.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
+platform=intel64
+dir=`pwd`
+target=${dir##*/}
 
-source $IFORT_COMPILER/bin/compilervars.sh intel64
+source $IFORT_COMPILER/bin/compilervars.sh $platform
 
-make VPATH="../../Source" -f ../makefile intel_osx_64_db
+echo Building $target
+make -j4 DEBUG=1 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/intel_win_64/make_radcal.sh b/Build/intel_win_64/make_radcal.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+platform=intel64
+dir=`pwd`
+target=${dir##*/}
+
+source $IFORT_COMPILER/bin/compilervars.sh $platform
+
+echo Building $target
+make -j4 DEBUG=1 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/makefile b/Build/makefile
@@ -103,15 +103,15 @@ intel_linux_64_db : setup $(obj_serial)
 
 intel_osx_64 : FFLAGS = -m64 -O2 $(GITINFO) 
 intel_osx_64 : LFLAGS = -static-intel
-intel_osx_64 : FOPENMPFLAGS = -qopenmp -qopenmp-link static
+intel_osx_64 : FOPENMPFLAGS = -openmp -openmp-link static
 intel_osx_64 : FCOMPL = ifort
 intel_osx_64 : obj = radcal_intel_osx_64
 intel_osx_64 : setup $(obj_serial)
 	$(FCOMPL) $(FFLAGS) $(LFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_serial)
 
 intel_osx_64_db : FFLAGS = -m64 -check -warn unused -O0 -auto -WB -traceback -g -fpe0 -fltconsistency -stand:f08 $(GITINFO) 
 intel_osx_64_db : LFLAGS = -static-intel
-intel_osx_64_db : FOPENMPFLAGS = -qopenmp -qopenmp-link static
+intel_osx_64_db : FOPENMPFLAGS = -openmp -openmp-link static
 intel_osx_64_db : FCOMPL = ifort
 intel_osx_64_db : obj = radcal_intel_osx_64_db
 intel_osx_64_db : setup $(obj_serial)