Commit 114f7580 authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

[FIX] librefpar replaces librefread

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.

bdf0888 2014-11-10 11:22:37 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [FIX] (tt): librefpar replaces librefread
 src/synt/tt/Makefile | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

cab39b2 2014-11-10 11:20:50 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [FIX] (refmet): let grema take refmet_rrcv from librefpar
 src/synt/ref/refmet/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

d974ba1 2014-11-10 11:16:55 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [FIX] (gremlin): librefpar replaces librefread
 src/green/gremlin1/Makefile       |  5 +++--
 src/green/gremlin1/README         |  7 ++-----
 src/green/gremlin1/tools/Makefile | 15 ++++++---------
 3 files changed, 11 insertions(+), 16 deletions(-)

199722d 2014-11-10 11:09:55 +0100 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [FIX] (gremlin): use librefpar instead of librefread
 src/green/gremlin1/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 5661
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parents 8ba8a6b3 538bb0e0
......@@ -30,6 +30,7 @@
# 10/01/2010 V1.4 libgin.a must be compiled before gremlin is going to
# be linked
# 14/01/2011 V1.5 call cxx/Makefile in top-level targets
# 10/11/2014 V1.6 librefpar replaces librefread
#
# ============================================================================
#
......@@ -128,7 +129,7 @@ gremlin: gremlin.o gremlin_help.o
$(FC) -o gremlin $^ \
-L$(LOCLIBDIR) \
-lgin \
-lgrrefsub -lrefread \
-lgrrefsub -lrefpar \
$(LINLIB) -ltf \
$(BUGGY) -L$(LOCLIBDIR) $(TF_LINK_PGPLOT) $(LDFLAGS)
......@@ -136,7 +137,7 @@ gremlin: gremlin.o gremlin_help.o
wgremlin: gremlin.o gremlin_help.o
$(FC) -o $@ $^ \
-lgin \
-lwrefsub -lrefread \
-lwrefsub -lrefpar \
$(LINLIB) -ltf $(TF_LINK_PGPLOT) \
$(BUGGY) -L$(LOCLIBDIR) $(LDFLAGS)
......@@ -173,9 +174,10 @@ package: $(TF_MAKEPKG)
fullpackage: $(TF_MAKEPKG)
$(MAKE) -f $< \
PACKAGE=gremlinwithlibs \
PACKAGEEXPORT="trunk/src/green/gremlin1:src trunk/src/synt/ref/refmet/sub:contrib/refread" \
PACKAGETARGETS="contrib/refread:all src:all" \
PACKAGELIBS="libtime libgrrefsub libwrefsub libsff libsffu libtf \
PACKAGEEXPORT="trunk/src/green/gremlin1:src" \
PACKAGETARGETS="src:all" \
PACKAGELIBS="libtime libgrrefsub libwrefsub librefpar \
libsff libsffu libtf \
libaff libgsexx libdatrwxx libfapidxx libfourier libsffxx \
libtsxx libtfxx"
endif
......
......@@ -30,13 +30,10 @@ Dependencies
required libraries:
libgin:
will be compiled by the Makefile in subdirectory libs
libtf, libgrrefsub (only for gremlin), libwrefsub (only for wgremlin):
libtf, librefpar, libgrrefsub (only for gremlin),
libwrefsub (only for wgremlin):
are available from directory src/libs
just call 'make install' in directory src/libs of your working copy
librefread:
is available in directory src/synt/ref/refmet
just call 'make librefread.a' in directory src/synt/ref/refmet of your
working copy
libpgplot:
is expected to be installed from external
libblas, liblapack:
......
......@@ -70,11 +70,11 @@
# polex requires:
# libtf
# moche requires:
# libtf, librefread
# libtf, librefpar
# moshift, moval, motab, mops, clemo, and splimo require:
# libgin, libtf
# mocon requires:
# libtf, librefread, libgin
# libtf, librefpar, libgin
# mop and pmotra require:
# libgin, libtf, libpgplot
# mocoxx and grestf require:
......@@ -84,13 +84,9 @@
# is available from directory src/green/gremlin1
# just call 'make libraries' in directory src/green/gremlin1 of your
# working copy
# libtf, libtfxx, libaff, libfourierxx:
# libtf, libtfxx, libaff, libfourierxx, librefpar:
# are available from directory src/libs
# just call 'make install' in directory src/libs of your working copy
# librefread:
# is available in directory src/synt/ref/refmet
# just call 'make librefread.a' in directory src/synt/ref/refmet of your
# working copy
# libpgplot:
# is expected to be installed from external
#
......@@ -98,6 +94,7 @@
# 09/02/2010 V1.0 Thomas Forbriger
# 10/11/2010 V1.1 only grereso depends on libnumrec
# 13/11/2010 V1.2 moved grereso to disan
# 10/11/2014 V1.3 librefpar replaces librefread
#
# ============================================================================
#
......@@ -180,13 +177,13 @@ polex: %: %.o
$(FC) -o $@ $^ $(FFLAGS) -ltf $(LDFLAGS)
moche: %: %.o
$(FC) -o $@ $^ $(FFLAGS) -lrefread -ltf $(LDFLAGS)
$(FC) -o $@ $^ $(FFLAGS) -lrefpar -ltf $(LDFLAGS)
moshift moval motab mops clemo splimo: %: %.o
$(FC) -o $@ $^ $(FFLAGS) -lgin -ltf $(LDFLAGS)
mocon: %: %.o
$(FC) -o $@ $^ $(FFLAGS) -lgin -lrefread -ltf $(LDFLAGS)
$(FC) -o $@ $^ $(FFLAGS) -lgin -lrefpar -ltf $(LDFLAGS)
mop pmotra: %: %.o
$(FC) -o $@ $^ $(FFLAGS) -lgin -ltf \
......
......@@ -33,6 +33,7 @@
# 14/01/2011 V1.4 implemented refmetx with libfapidxx interface
# 24/09/2014 thof: part of the code in librefread is moved to librefpar,
# a dedicated library in the collection of libraries
# 10/11/2014 thof: grema takes refmet_rrcv from librefpar
#
# ============================================================================
#
......@@ -116,7 +117,7 @@ refmatsh: main/refmatsh.o $(addprefix sub/, $(REFMETOBS))
matbau: %: main/%.o
$(FC) $< -o $@ $(LDFLAGS)
grema: %: main/%.o sub/refmet_rrcv.o
grema: %: main/%.o
$(FC) $(FFLAGS) $^ -o $@ -lrefpar -lrefread -ltf -lsff \
$(LDFLAGS)
......
#
# $Id$
#
# Makefile for src/synt/tt
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id: $
#
# Copyright (c) 2014 by Thomas Forbriger (BFO Schiltach)
#
# calculate synthetic travel times for seismic body waves
#
# REVISIONS and CHANGES
# 10/11/2014 V1.0 Thomas Forbriger
#
# ============================================================================
#
PROGRAMS=lazek ttplot
......@@ -38,4 +46,6 @@ clean:
-/bin/rm *.o *.bak
lazek ttplot: %: %.o
$(FC) -o $@ $< -L$(LOCLIBDIR) -lttsynt -ltf -lrefread $(TF_LINK_PGPLOT)
$(FC) -o $@ $< -L$(LOCLIBDIR) -lttsynt -ltf -lrefpar $(TF_LINK_PGPLOT)
# ----- END OF Makefile -----
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment