diff -rupN avl3.32/Avl/bin/Makefile avl3.32-new/Avl/bin/Makefile
--- avl3.32/Avl/bin/Makefile 2010-12-05 20:34:10.000000000 +0100
+++ avl3.32-new/Avl/bin/Makefile 2013-09-12 18:45:01.007658014 +0200
@@ -2,9 +2,17 @@
# Makefile for AVL
#
-BINDIR = .
-BINDIR = /home/codes/bin
-INSTALLCMD = install -s
+FC = gfortran
+
+#Subroutine SECOND source file
+SECOND = second_g77.f
+
+# override FFLAGS += -fdefault-real-8
+
+PLTOBJ = ../plotlib/libPltDP.a
+PLTLIB = -lX11
+
+EIGOBJ = ../eispack/eispack.a
SRC = ../src
@@ -19,80 +27,24 @@ userio.o plutil.o arrow3d.o getvm.o \
matrix.o spline.o sgutil.o \
second.o
-PLTOBJ = ../plotlib/libPlt.a
-EIGOBJ = ../eispack/eispack.a
-## EIGOBJ = eispack.o
###================================================
-### Default compilers and flags
-FC = f77
-FFLAGS = -O
-PLTLIB = -lX11
-FTNLIB =
-#Subroutine SECOND source file
-SECOND = second_g77.f
-##--------------------------
-
-# Uncomment flags for desired machine...
-
-##--------------------------
-### DEC Alpha with OSF and DEC f77/f90 compiler
-#FC = f77
-#FFLAGS = -fast -O4 -tune host
-##--------------------------
-### SGI setup
-#FC = f77
-#FFLAGS = -O2
-##--------------------------
-## Uncomment for RS/6000
-#FFLAGS = -O -qextname
-##--------------------------
-## Uncomment for HP-9000
-#FFLAGS = -O +ppu
-#FTNLIB = -U77
-##--------------------------
-### Absoft Linux f77
-#FC = f77
-#FFLAGS = -O -f -s -W -B108 -N34
-##--------------------------
-### f2c/gcc compiler driver
-#FC = fort77
-#FFLAGS = -O2 -fomit-frame-pointer
-##--------------------------
-### GNU g77
-#FC = g77
-#FFLAGS = -O3
-##--------------------------
-### Intel Fortran Compiler 8.x
-FC = ifort
-FFLAGS = -O
-PLTLIB = -L/usr/X11R6/lib -lX11
-SECOND = second_ifc.f
-#FTNLIB = -Vaxlib /usr/lib/C-ctype.o /usr/lib/C_name.o /usr/lib/ctype-info.o
-#FTNLIB = -Vaxlib -i_dynamic
-#FTNLIB = -Vaxlib
-##--------------------------
-### double-precision option (also need double precision Eispack and libPlt)
-FFLAGS = -O -r8
-PLTOBJ = ../plotlib/libPltDP.a
-#PLTOBJ = -lPltDP
all: $(PROGS)
install: $(PROGS)
- $(INSTALLCMD) $(PROGS) $(BINDIR)
+ install -Dm 0755 avl $(DESTDIR)$(BINDIR)/avl
clean:
- -/bin/rm $(PROGS)
- -/bin/rm *.o
+ rm -r $(PROGS)
+ rm -r *.o
$(SRC)/AVL.INC: $(SRC)/AINDEX.INC
touch $(SRC)/AVL.INC
avl: $(AOBJS)
$(FC) -o avl $(AOBJS) $(ALIBS) $(PLTOBJ) $(EIGOBJ) $(PLTLIB) $(FTNLIB)
- $(INSTALLCMD) avl $(BINDIR)
dtest: dtest.o
$(FC) -o dtest dtest.o
diff -rupN avl3.32/Avl/bin/Makefile_gfortran avl3.32-new/Avl/bin/Makefile_gfortran
--- avl3.32/Avl/bin/Makefile_gfortran 2010-08-17 18:22:09.000000000 +0200
+++ avl3.32-new/Avl/bin/Makefile_gfortran 2013-09-12 18:07:41.355484623 +0200
@@ -2,9 +2,6 @@
# Makefile for AVL
#
-BINDIR = ~/bin/
-INSTALLCMD = install -s
-
SRC = ../src
PROGS = avl
@@ -24,78 +21,18 @@ EIGOBJ = ../eispack/eispack.a
###================================================
### Default compilers and flags
-FC = f77
-FFLAGS = -O
-PLTLIB = -lX11
-FTNLIB =
-
-#Subroutine SECOND source file
-SECOND = second_g77.f
-
-##--------------------------
-
-# Uncomment flags for desired machine...
-
-##--------------------------
-### DEC Alpha with OSF and DEC f77/f90 compiler
-#FC = f77
-#FFLAGS = -fast -O4 -tune host
-##--------------------------
-### SGI setup
-#FC = f77
-#FFLAGS = -O2
-##--------------------------
-## Uncomment for RS/6000
-#FFLAGS = -O -qextname
-##--------------------------
-## Uncomment for HP-9000
-#FFLAGS = -O +ppu
-#FTNLIB = -U77
-##--------------------------
-### Absoft Linux f77
-#FC = f77
-#FFLAGS = -O -f -s -W -B108 -N34
-##--------------------------
-### f2c/gcc compiler driver
-#FC = fort77
-#FFLAGS = -O2 -fomit-frame-pointer
-##--------------------------
-### GNU g77
-#FC = g77
-#FFLAGS = -O3
-##--------------------------
-### Intel Fortran Compiler 8.x
-FC = ifort
-FFLAGS = -O
-PLTLIB = -L/usr/X11R6/lib -lX11
-SECOND = second_ifc.f
-#FTNLIB = -Vaxlib
-##--------------------------
-### double-precision option (also need double precision Eispack and libPlt)
-FFLAGS = -O -r8
-PLTOBJ = ../plotlib/libPltDP.a
-##---------------------------------------
-## Uncomment for Mac OSX gfortran
FC = gfortran
+PLTLIB = -lX11
+PLTOBJ = ../plotlib/libPlt.a
+# FFLAGS += -fdefault-real-8
+# PLTOBJ = ../plotlib/libPltDP.a
-#ACHK = -fbounds-check
-ACHK =
-
-#FTNLIB = -Vaxlib
-FTNLIB =
+# Subroutine SECOND source file
SECOND = second_g77.f
-#DP = -fdefault-real-8
-DP =
-#PLTOBJ = ../plotlib/libPltDP.a
-PLTOBJ = ../plotlib/libPlt_gfortran.a
-
-FFLAGS = -O $(ACHK) $(DP)
##---------------------------------------
-
-
all: $(PROGS)
install: $(PROGS)
diff -rupN avl3.32/Avl/eispack/Makefile avl3.32-new/Avl/eispack/Makefile
--- avl3.32/Avl/eispack/Makefile 2011-09-04 03:14:44.000000000 +0200
+++ avl3.32-new/Avl/eispack/Makefile 2013-09-12 18:29:31.732356827 +0200
@@ -1,22 +1,17 @@
-
-FC = ifort
-FLG = -O
EISLIB = eispack.a
-AR = ar r
-RAN = ranlib
-DP =
+FC = gfortran
#- uncomment for double-precision option
-DP = -r8
+# DP = -fdefault-real-8
eispack.a: eispack.f
- $(FC) -c $(FLG) $(DP) eispack.f
- $(AR) $(EISLIB) eispack.o
- $(RAN) $(EISLIB)
+ $(FC) -c $(FFLAGS) $(DP) eispack.f
+ ar -r $(EISLIB) eispack.o
+ ranlib $(EISLIB)
clean:
- /bin/rm *.o *.a
+ rm -f *.o *.a
diff -rupN avl3.32/Avl/plotlib/Makefile avl3.32-new/Avl/plotlib/Makefile
--- avl3.32/Avl/plotlib/Makefile 2010-06-07 16:29:26.000000000 +0200
+++ avl3.32-new/Avl/plotlib/Makefile 2013-09-12 18:31:08.849851424 +0200
@@ -21,22 +21,16 @@
# or drela@mit.edu
#***********************************************************************
-
-#================================#
-# Makefile for Xplot11 library #
-# edit the config.make file to #
-# set specific options for your #
-# system #
-#================================#
-
# Point to your install directory
-#INSTALLDIR = /home/codes/bin
-#INSTALLDIR = /usr/local/lib
INSTALLDIR = .
-# Use these to set default library name (overridden in config.make file)
-PLTLIB = libPlt.a
-#PLTLIB = libPltDP.a
+FC = gfortran
+
+PLTLIB = libPltDP.a
+
+# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
+override CFLAGS += -DUNDERSCORE
+# override FFLAGS += -fdefault-real-8
###========================================================
@@ -67,16 +61,11 @@ OBJ3D = plt_3D.o
###-------------------------------------------------------------------------
-### Set compiler, compiler flags, name of output object library
-include ./config.make
-
-
-###-------------------------------------------------------------------------
### Basic make targets - build library, test programs
$(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)
@@ -86,13 +75,13 @@ test: $(PLTLIB)
### Utility functions - install the library, clean the directory
install: $(PLTLIB)
- mv $(PLTLIB) $(INSTALLDIR)
- $(RANLIB) $(INSTALLDIR)/$(PLTLIB)
+ mv $(PLTLIB) $(INSTALLDIR)
+ 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)