diff -rupN xfoil6.97/Xfoil/bin/Makefile xfoil6.97-new/Xfoil/bin/Makefile
--- xfoil6.97/Xfoil/bin/Makefile 2008-04-07 23:05:29.000000000 +0200
+++ xfoil6.97-new/Xfoil/bin/Makefile 2013-09-12 19:25:33.288067079 +0200
@@ -4,10 +4,12 @@
# M.Drela
#*********************************************************
+FC = gfortran
+PLTOBJ = ../plotlib/libPltDP.a
+override CFLAGS += -DUNDERSCORE
+override FFLAGS += -fdefault-real-8
+LIBS = -lX11
-SHELL = sh
-#BINDIR = $(HOME)/bin/
-BINDIR = .
PROGS = xfoil pplot pxplot
@@ -32,110 +34,28 @@ OSOBJ = frplot0.o
# Use this for individual TS-wave frequency plotting
OSOBJ = frplot.o ntcalc.o osmap.o getosfile.o
-##----------------------------------------------------
-PLTOBJ = ../plotlib/libPlt.a
-
-# Use this if you have a copy of the plotlib as a system library
-#PLTOBJ = -lPlt
-
-# The extra location arg here is for Linux which places X libs in /usr/X11R6
-PLTLIB = -L/usr/X11R6/lib -lX11
-
###================================================
-### Default compilers and flags
-### FFLOPT used for xsolve.f
-FC = f77
-FFLAGS = -O
-FFLOPT = -O
-INSTALLCMD = install -s
-
-CC = cc
-CFLAGS = -O -DUNDERSCORE
-
-##--------------------------
-
-# Uncomment flags for desired machine...
-
-##--------------------------
-### DEC Alpha with OSF and DEC f77/f90 compiler
-#FC = f77
-#FFLAGS = -fast -O4 -tune host
-#FFLOPT = -fast -O4 -tune host
-#FFLOPT = -fast -O5 -tune host -unroll 3
-# Debug flags
-#FFLAGS = -O0 -g
-#FFLOPT = -fast -O4 -tune host
-##--------------------------
-### SGI setup
-#FC = f77
-#FFLAGS = -O2 -static
-#FFLOPT = -O2 -static
-##--------------------------
-## Uncomment for RS/6000
-#FFLAGS = -O -qextname
-#FFLOPT = -O -qextname
-##--------------------------
-## Uncomment for HP-9000
-#FFLAGS = -O +ppu
-#FFLOPT = -O +ppu
-#FTNLIB = -U77
-##--------------------------
-### Absoft Linux f77
-#FC = f77
-#FFLAGS = -O -f -s -W -B108 -N34
-#FFLOPT = -O -f -s -W -B108 -N34
-##--------------------------
-### f2c/gcc compiler driver
-#FC = fort77
-#FFLAGS = -O2 -fomit-frame-pointer
-#FFLOPT = -O2 -fomit-frame-pointer
-##--------------------------
-### GNU g77
-#FC = g77
-#FFLAGS = -O3 -fomit-frame-pointer
-#FFLOPT = -O3 -fomit-frame-pointer
-# Debug flags (symbols, array bounds)
-#FC = g77
-#FFLAGS = -g -O0 -C
-##--------------------------
-### Intel Fortran Compiler
-FC = ifort
-FFLAGS = -O
-FFLOPT = -O
-#FTNLIB = -Vaxlib /usr/lib/C-ctype.o /usr/lib/C_name.o /usr/lib/ctype-info.o
-#FTNLIB = -Vaxlib
-#FTNLIB = -i_dynamic
-
-##--------------------------
-### Double precision option
-FFLAGS = -O -r8 -CB
-FFLOPT = -O -r8 -CB
-PLTOBJ = ../plotlib/libPltDP.a
-
-FFLAGS = -O -r8 -ftrapuv -fpe0
-FFLOPT = -O -r8 -ftrapuv -fpe0
-
all: $(PROGS)
install:
- $(INSTALLCMD) $(PROGS) $(BINDIR)
+ install -d $(DESTDIR)$(BINDIR)
+ install -m 0755 $(PROGS) $(DESTDIR)$(BINDIR)
clean:
- -/bin/rm $(PROGS)
- -/bin/rm $(XFOILOBJ) $(XUTILOBJ) $(OSOBJ) $(PPLOTOBJ) $(PXPLOTOBJ)
-# -/bin/rm *.o
+ rm -f $(PROGS)
+ rm -f$(XFOILOBJ) $(XUTILOBJ) $(OSOBJ) $(PPLOTOBJ) $(PXPLOTOBJ)
xfoil: $(XFOILOBJ) $(XUTILOBJ) $(OSOBJ)
- $(FC) -o xfoil $(XFOILOBJ) $(XUTILOBJ) $(OSOBJ) $(PLTOBJ) $(PLTLIB) $(FTNLIB)
+ $(FC) -o xfoil $(XFOILOBJ) $(XUTILOBJ) $(OSOBJ) $(PLTOBJ) $(LIBS) $(FTNLIB)
pxplot: $(PXPLOTOBJ) $(XUTILOBJ)
- $(FC) -o pxplot $(PXPLOTOBJ) $(XUTILOBJ) $(PLTOBJ) $(PLTLIB) $(FTNLIB)
+ $(FC) -o pxplot $(PXPLOTOBJ) $(XUTILOBJ) $(PLTOBJ) $(LIBS) $(FTNLIB)
pplot: $(PPLOTOBJ) $(XUTILOBJ)
- $(FC) -o pplot $(PPLOTOBJ) $(XUTILOBJ) $(PLTOBJ) $(PLTLIB) $(FTNLIB)
+ $(FC) -o pplot $(PPLOTOBJ) $(XUTILOBJ) $(PLTOBJ) $(LIBS) $(FTNLIB)
xfoil.o: $(SRC)/xfoil.f $(SRC)/XFOIL.INC $(SRC)/XBL.INC
diff -rupN xfoil6.97/Xfoil/orrs/bin/Makefile xfoil6.97-new/Xfoil/orrs/bin/Makefile
--- xfoil6.97/Xfoil/orrs/bin/Makefile 2008-04-07 15:27:10.000000000 +0200
+++ xfoil6.97-new/Xfoil/orrs/bin/Makefile 2013-09-12 19:13:04.660557859 +0200
@@ -1,27 +1,10 @@
SRC = ../src
-PLTOBJ = /var/local/codes/Xplot/libPlt.a
-
-#========================================
-# Default compiler flags
-FC = f77
-FLG = -O
-PLTLIB = -lX11
-FTNLIB =
-
-#========================================
-# Uncomment for Intel Fortran Compiler
-FC = ifort
-FLG = -O -fpe0 -CB
-PLTLIB = -L/usr/X11R6/lib -lX11
-FTNLIB =
-
-# Additional IFC stuff needed on MIT's Athena system
-#FC = ifc
-#FTNLIB = -Vaxlib /usr/lib/C-ctype.o /usr/lib/C_name.o /usr/lib/ctype-info.o
-
-#========================================
+FC = gfortran
+override FFLAGS += -fdefault-real-8
+LIBS = -lX11
+PLTOBJ = libPltDP.a
OS: osgen osmap.o
@@ -33,25 +16,25 @@ osgen: osgen.o io.o spline.o getarg0.o
osgen1: osgen1.o io.o spline.o getarg0.o
$(FC) -o osgen1 osgen1.o io.o spline.o getarg0.o $(FTNLIB)
fscorr: fscorr.o fs.o
- $(FC) -o fscorr fscorr.o fs.o $(PLTOBJ) $(PLTLIB)
+ $(FC) -o fscorr fscorr.o fs.o $(PLTOBJ) $(LIBS)
fsrun: fsrun.o fs.o
- $(FC) -o fsrun fsrun.o fs.o $(PLTOBJ) $(PLTLIB)
+ $(FC) -o fsrun fsrun.o fs.o $(PLTOBJ) $(LIBS)
intai: intai.o osmap.o plutil.o
- $(FC) -o intai intai.o osmap.o plutil.o $(PLTOBJ) $(PLTLIB)
+ $(FC) -o intai intai.o osmap.o plutil.o $(PLTOBJ) $(LIBS)
mappl1: mappl1.o ask1.o conlab.o io.o getarg0.o
- $(FC) -o mappl1 mappl1.o ask1.o conlab.o io.o getarg0.o $(PLTOBJ) $(PLTLIB)
+ $(FC) -o mappl1 mappl1.o ask1.o conlab.o io.o getarg0.o $(PLTOBJ) $(LIBS)
ncorr: ncorr.o fs.o
- $(FC) -o ncorr ncorr.o fs.o $(PLTOBJ) $(PLTLIB)
+ $(FC) -o ncorr ncorr.o fs.o $(PLTOBJ) $(LIBS)
osrun: osrun.o fs.o orrs.o ospres.o plutil.o userio.o
$(FC) -o osrun osrun.o fs.o orrs.o ospres.o \
-plutil.o userio.o $(PLTOBJ) $(PLTLIB) $(FTNLIB)
+plutil.o userio.o $(PLTOBJ) $(LIBS) $(FTNLIB)
osseq: osseq.o fs.o orrs.o ospres.o plutil.o userio.o
$(FC) -o osseq osseq.o fs.o orrs.o ospres.o \
-plutil.o userio.o $(PLTOBJ) $(PLTLIB) $(FTNLIB)
+plutil.o userio.o $(PLTOBJ) $(LIBS) $(FTNLIB)
pfplot: pfplot.o fs.o ask1.o
- $(FC) -o pfplot pfplot.o fs.o ask1.o $(PLTOBJ) $(PLTLIB)
+ $(FC) -o pfplot pfplot.o fs.o ask1.o $(PLTOBJ) $(LIBS)
roll: roll.o
- $(FC) -o roll roll.o $(PLTOBJ) $(PLTLIB) $(FTNLIB)
+ $(FC) -o roll roll.o $(PLTOBJ) $(LIBS) $(FTNLIB)
as2bi: as2bi.o io.o getarg0.o
$(FC) -o as2bi as2bi.o io.o getarg0.o $(FTNLIB)
bi2as: bi2as.o io.o getarg0.o
diff -rupN xfoil6.97/Xfoil/plotlib/Makefile xfoil6.97-new/Xfoil/plotlib/Makefile
--- xfoil6.97/Xfoil/plotlib/Makefile 2004-06-02 18:23:43.000000000 +0200
+++ xfoil6.97-new/Xfoil/plotlib/Makefile 2013-09-12 19:18:32.977605106 +0200
@@ -22,21 +22,13 @@
#***********************************************************************
-#================================#
-# Makefile for Xplot11 library #
-# edit the config.make file to #
-# set specific options for your #
-# system #
-#================================#
-
-# Point to your install directory
-#INSTALLDIR= $(HOME)/lib
-#INSTALLDIR= /usr/local/lib
-#INSTALLDIR= .
-
-# Use these to set default library name (overridden in config.make file)
-PLTLIB = libPlt.a
-#PLTLIB = libPltDP.a
+INSTALLDIR= .
+
+FC = gfortran
+PLTLIB = libPltDP.a
+override FFLAGS += -fdefault-real-8
+# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
+override CFLAGS += -DUNDERSCORE
###========================================================
@@ -67,39 +59,15 @@ OBJ3D = plt_3D.o
#OBJMISC = util-ops.o
-###================================================
-### Default compilers and flags, install commands
-FC = f77
-CC = cc
-# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
-DEFINE = -DUNDERSCORE
-# Uncomment DP to make double-precision version
-#DP = -r8
-FFLAGS = -O $(DP)
-CFLAGS = -O $(DEFINE)
-AR = ar r
-RANLIB = ranlib
-LINKLIB = -lX11
-###================================================
-
-
-
-###================================================
-### This line includes your compiler/make options
-### with definitions for compiler and flags
-
-include ./config.make
-
-###================================================
-
-
###-------------------------------------------------------------------------
### Basic make targets - build library, test programs
+all: $(PLTLIB)
+
$(PLTLIB): $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
- $(AR) $(PLTLIB) $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
- $(RANLIB) $(PLTLIB)
+ ar -r $(PLTLIB) $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
+ ranlib $(PLTLIB)
test: $(PLTLIB)
(cd examples; make test)
@@ -110,12 +78,12 @@ test: $(PLTLIB)
install: $(PLTLIB)
mv $(PLTLIB) $(INSTALLDIR)
- $(RANLIB) $(INSTALLDIR)/$(PLTLIB)
+ ranlib $(INSTALLDIR)/$(PLTLIB)
clean:
- -/bin/rm $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
- -/bin/rm $(PLTLIB)
- -/bin/rm plot*.ps
+ rm -f $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
+ rm -f $(PLTLIB)
+ rm -f plot*.ps
(cd examples; make clean)