[flexpart] 07/26: Merge back unchanged makefiles

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/9.02-10
in repository flexpart.

commit 949e210e1cb8eb23f5651e88504663ab08a179ae
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 23 20:33:29 2013 +0100

    Merge back unchanged makefiles
---
 makefile.ecmwf_gfortran | 21 +++++++++++----------
 makefile.gfs_gfortran   | 16 ++++++++--------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/makefile.ecmwf_gfortran b/makefile.ecmwf_gfortran
index 47354b4..d0ce398 100644
--- a/makefile.ecmwf_gfortran
+++ b/makefile.ecmwf_gfortran
@@ -1,14 +1,15 @@
 SHELL = /bin/bash
-MAIN = flexpart.ecmwf
+MAIN = FLEXPART_GFORTRAN
 #
 
 FC       = gfortran
-INCPATH  = /usr/include
-LIBPATH1 = /usr/lib
-LIBPATH2 = 
-FFLAGS   = -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) 
-LFLAGS  = $(LDFLAGS) $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
-MODPATH = /usr/include
+INCPATH  = /xnilu_wrk/flex_wrk/bin64/grib_api/include
+LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
+LIBPATH2 = /flex_wrk/flexpart/lib64/gfortran/lib/
+#FFLAGS   =   -O3 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+FFLAGS   =   -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+#FFLAGS   =   -fbounds-check -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
 #
 
 MODOBJS = \
@@ -78,13 +79,13 @@ dynamic_viscosity.o     get_settling.o
 
 
 $(MAIN): $(MODOBJS) $(OBJECTS)
-	$(FC) *.o -o $(MAIN) $(LFLAGS)
+	$(FC) *.o -o $(MAIN) $(LDFLAGS)
 
 $(OBJECTS): $(MODOBJS)
 
 %.o: %.f90
-	$(FC) -c $(FFLAGS) -I$(MODPATH) $<
+	$(FC) -c $(FFLAGS) $<
 
 clean:
-	rm -f *.o *.mod
+	rm *.o *.mod
 
diff --git a/makefile.gfs_gfortran b/makefile.gfs_gfortran
index 1530de0..372d703 100644
--- a/makefile.gfs_gfortran
+++ b/makefile.gfs_gfortran
@@ -1,14 +1,14 @@
 SHELL = /bin/bash
-MAIN = flexpart.gfs
+MAIN = FLEXPART_GFS_GFORTRAN
 INCF	= incl* 
 #
 
 FC       = gfortran
-INCPATH  = /usr/include
-LIBPATH1 = /usr/lib
-LIBPATH2 = 
-FFLAGS   = -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) 
-LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed  -lgrib_api_f90 -lgrib_api -lm -ljasper
+INCPATH  = /xnilu_wrk/flex_wrk/bin64/grib_api/include
+LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
+LIBPATH2 = /flex_wrk/flexpart/lib64/gfortran/lib/
+FFLAGS   =   -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
 #
 
 MODOBJS = \
@@ -78,7 +78,7 @@ dynamic_viscosity.o     get_settling.o
 
 
 $(MAIN): $(MODOBJS) $(OBJECTS)
-	$(FC) *.o -o $(MAIN) $(LFLAGS)
+	$(FC) *.o -o $(MAIN) $(LDFLAGS)
 
 $(OBJECTS): $(MODOBJS)
 
@@ -86,5 +86,5 @@ $(OBJECTS): $(MODOBJS)
 	$(FC) -c $(FFLAGS) $<
 
 clean:
-	rm -f *.o *.mod $(MAIN)
+	rm *.o *.mod
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flexpart.git