|
 |
1f56b88 |
diff -rupN Avl/bin/Makefile Avl-new/bin/Makefile
|
|
|
f918a3b |
--- Avl/bin/Makefile 2015-11-03 14:37:17.000000000 +0100
|
|
|
f918a3b |
+++ Avl-new/bin/Makefile 2017-02-08 10:43:00.507862894 +0100
|
|
|
1f56b88 |
@@ -2,8 +2,17 @@
|
|
|
fefb1a0 |
# Makefile for AVL
|
|
|
fefb1a0 |
#
|
|
|
fefb1a0 |
|
|
|
1f56b88 |
-BINDIR = /home/codes/bin/
|
|
|
fefb1a0 |
-INSTALLCMD = install -s
|
|
|
fefb1a0 |
+FC = gfortran
|
|
|
fefb1a0 |
+
|
|
|
fefb1a0 |
+#Subroutine SECOND source file
|
|
|
fefb1a0 |
+SECOND = second_g77.f
|
|
|
fefb1a0 |
+
|
|
|
0a906fc |
+# override FFLAGS += -fdefault-real-8
|
|
|
fefb1a0 |
+
|
|
|
1f56b88 |
+PLTOBJ = ../plotlib/libPlt.a
|
|
|
fefb1a0 |
+PLTLIB = -lX11
|
|
|
fefb1a0 |
+
|
|
|
fefb1a0 |
+EIGOBJ = ../eispack/eispack.a
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
SRC = ../src
|
|
|
fefb1a0 |
|
|
|
f918a3b |
@@ -18,103 +27,22 @@ userio.o plutil.o arrow3d.o getvm.o \
|
|
|
fefb1a0 |
matrix.o spline.o sgutil.o \
|
|
|
fefb1a0 |
second.o
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
-PLTOBJ = ../plotlib/libPlt.a
|
|
|
fefb1a0 |
-EIGOBJ = ../eispack/eispack.a
|
|
|
fefb1a0 |
-## EIGOBJ = eispack.o
|
|
|
1f56b88 |
-
|
|
|
fefb1a0 |
###================================================
|
|
|
fefb1a0 |
-### Default compilers and flags
|
|
|
fefb1a0 |
-FC = f77
|
|
|
fefb1a0 |
-FFLAGS = -O
|
|
|
fefb1a0 |
-PLTLIB = -lX11
|
|
|
fefb1a0 |
-FTNLIB =
|
|
|
1f56b88 |
-
|
|
|
fefb1a0 |
-#Subroutine SECOND source file
|
|
|
fefb1a0 |
-SECOND = second_g77.f
|
|
|
1f56b88 |
-
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-
|
|
|
fefb1a0 |
-# Uncomment flags for desired machine...
|
|
|
fefb1a0 |
-
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### DEC Alpha with OSF and DEC f77/f90 compiler
|
|
|
fefb1a0 |
-#FC = f77
|
|
|
fefb1a0 |
-#FFLAGS = -fast -O4 -tune host
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### SGI setup
|
|
|
fefb1a0 |
-#FC = f77
|
|
|
fefb1a0 |
-#FFLAGS = -O2
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-## Uncomment for RS/6000
|
|
|
fefb1a0 |
-#FFLAGS = -O -qextname
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-## Uncomment for HP-9000
|
|
|
fefb1a0 |
-#FFLAGS = -O +ppu
|
|
|
fefb1a0 |
-#FTNLIB = -U77
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### Absoft Linux f77
|
|
|
fefb1a0 |
-#FC = f77
|
|
|
fefb1a0 |
-#FFLAGS = -O -f -s -W -B108 -N34
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### f2c/gcc compiler driver
|
|
|
fefb1a0 |
-#FC = fort77
|
|
|
fefb1a0 |
-#FFLAGS = -O2 -fomit-frame-pointer
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### GNU g77
|
|
|
fefb1a0 |
-#FC = g77
|
|
|
fefb1a0 |
-#FFLAGS = -O3
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### Intel Fortran Compiler 8.x
|
|
|
fefb1a0 |
-FC = ifort
|
|
|
fefb1a0 |
-FFLAGS = -O
|
|
|
fefb1a0 |
-PLTLIB = -L/usr/X11R6/lib -lX11
|
|
|
fefb1a0 |
-SECOND = second_ifc.f
|
|
|
fefb1a0 |
-#FTNLIB = -Vaxlib
|
|
|
fefb1a0 |
-##--------------------------
|
|
|
fefb1a0 |
-### double-precision option (also need double precision Eispack and libPlt)
|
|
|
fefb1a0 |
-FFLAGS = -O -r8
|
|
|
1f56b88 |
-PLTOBJ = ../plotlib/libPltDP.a
|
|
|
1f56b88 |
-
|
|
|
1f56b88 |
-##---------------------------------------
|
|
|
1f56b88 |
-## Uncomment for Mac OSX gfortran
|
|
|
1f56b88 |
-FC = gfortran
|
|
|
1f56b88 |
-
|
|
|
1f56b88 |
-ACHK = -fbounds-check -finit-real=inf -ffpe-trap=invalid,zero,denormal
|
|
|
1f56b88 |
-#ACHK =
|
|
|
1f56b88 |
-
|
|
|
1f56b88 |
-
|
|
|
1f56b88 |
-#FTNLIB = -Vaxlib
|
|
|
1f56b88 |
-FTNLIB =
|
|
|
1f56b88 |
-SECOND = second_g77.f
|
|
|
1f56b88 |
-
|
|
|
1f56b88 |
-DP =
|
|
|
f918a3b |
-PLTOBJ = ../plotlib/libPlt_gDP.a
|
|
|
f918a3b |
-EIGOBJ = ../eispack/eispack_gDP.a
|
|
|
1f56b88 |
-
|
|
|
f918a3b |
-DP = -fdefault-real-8
|
|
|
f918a3b |
-PLTOBJ = ../plotlib/libPlt_gDP.a
|
|
|
f918a3b |
-EIGOBJ = ../eispack/eispack_gDP.a
|
|
|
1f56b88 |
-
|
|
|
f918a3b |
-FFLAGS = -O $(ACHK) $(DP)
|
|
|
1f56b88 |
-##---------------------------------------
|
|
|
1f56b88 |
-
|
|
|
f918a3b |
-
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
all: $(PROGS)
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
install: $(PROGS)
|
|
|
fefb1a0 |
- $(INSTALLCMD) $(PROGS) $(BINDIR)
|
|
|
fefb1a0 |
+ install -Dm 0755 avl $(DESTDIR)$(BINDIR)/avl
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
clean:
|
|
|
fefb1a0 |
- -/bin/rm $(PROGS)
|
|
|
fefb1a0 |
- -/bin/rm *.o
|
|
|
1f56b88 |
+ rm $(PROGS)
|
|
|
1f56b88 |
+ rm *.o
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
$(SRC)/AVL.INC: $(SRC)/AINDEX.INC
|
|
|
fefb1a0 |
touch $(SRC)/AVL.INC
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
avl: $(AOBJS)
|
|
|
fefb1a0 |
$(FC) -o avl $(AOBJS) $(ALIBS) $(PLTOBJ) $(EIGOBJ) $(PLTLIB) $(FTNLIB)
|
|
|
fefb1a0 |
- $(INSTALLCMD) avl $(BINDIR)
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
dtest: dtest.o
|
|
|
fefb1a0 |
$(FC) -o dtest dtest.o
|
|
|
1f56b88 |
diff -rupN Avl/eispack/Makefile Avl-new/eispack/Makefile
|
|
|
f918a3b |
--- Avl/eispack/Makefile 2015-04-17 22:50:20.000000000 +0200
|
|
|
f918a3b |
+++ Avl-new/eispack/Makefile 2017-02-08 10:40:20.980387082 +0100
|
|
|
1f56b88 |
@@ -1,22 +1,15 @@
|
|
|
fefb1a0 |
|
|
|
1f56b88 |
+EISLIB = eispack.a
|
|
|
fefb1a0 |
FC = gfortran
|
|
|
fefb1a0 |
-FLG = -O
|
|
|
fefb1a0 |
-AR = ar r
|
|
|
fefb1a0 |
-RAN = ranlib
|
|
|
1f56b88 |
-
|
|
|
fefb1a0 |
-DP =
|
|
|
1f56b88 |
-EISLIB = eispack_gSP.a
|
|
|
1f56b88 |
-
|
|
|
1f56b88 |
-#DP = -fdefault-real-8
|
|
|
1f56b88 |
-#EISLIB = eispack_gDP.a
|
|
|
0a906fc |
+# DP = -fdefault-real-8
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
|
|
|
1f56b88 |
$(EISLIB): eispack.f
|
|
|
fefb1a0 |
- $(FC) -c $(FLG) $(DP) eispack.f
|
|
|
fefb1a0 |
- $(AR) $(EISLIB) eispack.o
|
|
|
fefb1a0 |
- $(RAN) $(EISLIB)
|
|
|
fefb1a0 |
+ $(FC) -c $(FFLAGS) $(DP) eispack.f
|
|
|
fefb1a0 |
+ ar -r $(EISLIB) eispack.o
|
|
|
fefb1a0 |
+ ranlib $(EISLIB)
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
clean:
|
|
|
fefb1a0 |
- /bin/rm *.o *.a
|
|
|
fefb1a0 |
+ rm -f *.o *.a
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
|
|
|
1f56b88 |
diff -rupN Avl/plotlib/Makefile Avl-new/plotlib/Makefile
|
|
|
f918a3b |
--- Avl/plotlib/Makefile 2015-04-17 22:51:21.000000000 +0200
|
|
|
f918a3b |
+++ Avl-new/plotlib/Makefile 2017-02-08 10:40:20.981387079 +0100
|
|
|
1f56b88 |
@@ -21,23 +21,16 @@
|
|
|
fefb1a0 |
# or drela@mit.edu
|
|
|
fefb1a0 |
#***********************************************************************
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
-
|
|
|
fefb1a0 |
-#================================#
|
|
|
fefb1a0 |
-# Makefile for Xplot11 library #
|
|
|
fefb1a0 |
-# edit the config.make file to #
|
|
|
fefb1a0 |
-# set specific options for your #
|
|
|
fefb1a0 |
-# system #
|
|
|
fefb1a0 |
-#================================#
|
|
|
fefb1a0 |
-
|
|
|
fefb1a0 |
# Point to your install directory
|
|
|
fefb1a0 |
-#INSTALLDIR = /home/codes/bin
|
|
|
fefb1a0 |
-#INSTALLDIR = /usr/local/lib
|
|
|
fefb1a0 |
INSTALLDIR = .
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
-# Use these to set default library name (overridden in config.make file)
|
|
|
fefb1a0 |
+FC = gfortran
|
|
|
fefb1a0 |
+
|
|
|
1f56b88 |
PLTLIB = libPlt.a
|
|
|
1f56b88 |
-#PLTLIB = libPltDP.a
|
|
|
1f56b88 |
|
|
|
fefb1a0 |
+# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
|
|
|
fefb1a0 |
+override CFLAGS += -DUNDERSCORE
|
|
|
0a906fc |
+# override FFLAGS += -fdefault-real-8
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
###========================================================
|
|
|
1f56b88 |
### Basic plot library object files
|
|
|
1f56b88 |
@@ -67,16 +60,11 @@ OBJ3D = plt_3D.o
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
###-------------------------------------------------------------------------
|
|
|
fefb1a0 |
-### Set compiler, compiler flags, name of output object library
|
|
|
fefb1a0 |
-include ./config.make
|
|
|
fefb1a0 |
-
|
|
|
fefb1a0 |
-
|
|
|
fefb1a0 |
-###-------------------------------------------------------------------------
|
|
|
fefb1a0 |
### Basic make targets - build library, test programs
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
$(PLTLIB): $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
|
|
|
fefb1a0 |
- $(AR) $(PLTLIB) $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
|
|
|
fefb1a0 |
- $(RANLIB) $(PLTLIB)
|
|
|
fefb1a0 |
+ ar -r $(PLTLIB) $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
|
|
|
fefb1a0 |
+ ranlib $(PLTLIB)
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
test: $(PLTLIB)
|
|
|
fefb1a0 |
(cd examples; make test)
|
|
|
1f56b88 |
@@ -86,13 +74,13 @@ test: $(PLTLIB)
|
|
|
fefb1a0 |
### Utility functions - install the library, clean the directory
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
install: $(PLTLIB)
|
|
|
fefb1a0 |
- mv $(PLTLIB) $(INSTALLDIR)
|
|
|
fefb1a0 |
- $(RANLIB) $(INSTALLDIR)/$(PLTLIB)
|
|
|
fefb1a0 |
+ mv $(PLTLIB) $(INSTALLDIR)
|
|
|
fefb1a0 |
+ ranlib $(INSTALLDIR)/$(PLTLIB)
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
clean:
|
|
|
fefb1a0 |
- -/bin/rm $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
|
|
|
fefb1a0 |
- -/bin/rm $(PLTLIB)
|
|
|
fefb1a0 |
- -/bin/rm plot*.ps
|
|
|
fefb1a0 |
+ rm -f $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
|
|
|
fefb1a0 |
+ rm -f $(PLTLIB)
|
|
|
fefb1a0 |
+ rm -f plot*.ps
|
|
|
fefb1a0 |
(cd examples; make clean)
|
|
|
fefb1a0 |
|
|
|
fefb1a0 |
|