1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Changes needed to build on Debian.
Forwarded: not-needed
Last-Updated: 2014-10-24
Index: flextra-5.0/makefile.ecmwf
===================================================================
--- flextra-5.0.orig/makefile.ecmwf
+++ flextra-5.0/makefile.ecmwf
@@ -1,14 +1,13 @@
SHELL = /bin/bash
-MAIN = FLEXTRA_ECMWF
+MAIN = flextra.ecmwf
INCF = incl*
#
-INCPATH = /nilu2/home/flexpart/lib64/absoft/include
-LIBPATH1 = /nilu2/home/flexpart/lib64/absoft/lib
-LIBPATH2 = /nilu2/home/flexpart/lib64/absoft/lib
-FFLAGS = -O2 -s -I$(INCPATH) -p$(INCPATH) -m64 -mcmodel=medium
-#FFLAGS = -g -Rb -Rc -Rs -s -I$(INCPATH) -p$(INCPATH) -m64 -mcmodel=medium
-LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
+INCPATH = /usr/include
+LIBPATH1 = /usr/lib
+LIBPATH2 = /usr/lib
+FFLAGS = $(FCFLAGS) -fPIC -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+LFLAGS = $(FFLAGS) $(LDFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
#
OBJECTS = caldate.o openoutput.o \
@@ -45,6 +44,6 @@ OBJECTS = caldate.o openo
$(MAIN): $(OBJECTS)
- $(FC) *.o -o $(MAIN) $(LDFLAGS)
+ $(FC) *.o -o $(MAIN) $(LFLAGS)
$(OBJECTS): $(INCF)
Index: flextra-5.0/makefile.gfs
===================================================================
--- flextra-5.0.orig/makefile.gfs
+++ flextra-5.0/makefile.gfs
@@ -1,15 +1,14 @@
SHELL = /bin/bash
-MAIN = FLEXTRA_GFS
+MAIN = flextra.gfs
INCF = incl*
#
-FC = /opt/absoft/bin/f95
-INCPATH = /nilu/home/flexpart/lib/grib_api/include
-LIBPATH1 = /nilu/home/flexpart/lib/grib_api/lib
-LIBPATH2 = /nilu/home/flexpart/lib/jasper/lib
-#FFLAGS = -s -B108 -YEXT_NAMES=LCS -I$(INCPATH)
-FFLAGS = -g -Rb -Rc -Rs -s -B108 -YEXT_NAMES=LCS -I$(INCPATH) -p$(INCPATH)
-LDFLAGS = $(FFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) -lgrib_api_f77 -lgrib_api -lm -ljasper
+FC = gfortran
+INCPATH = /usr/include
+LIBPATH1 = /usr/lib
+LIBPATH2 = /usr/lib
+FFLAGS = $(FCFLAGS) -fPIC -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+LFLAGS = $(FFLAGS) $(LDFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) -lgrib_api_f77 -lgrib_api -lm -ljasper
#
OBJECTS = caldate.o openoutput.o \
@@ -46,6 +45,6 @@ OBJECTS = caldate.o openo
$(MAIN): $(OBJECTS)
- $(FC) *.o -o $(MAIN) $(LDFLAGS)
+ $(FC) *.o -o $(MAIN) $(LFLAGS)
$(OBJECTS): $(INCF)
|