Commit c1b613b9 authored by thomas.forbriger's avatar thomas.forbriger
Browse files

[WP][FIX] (ticket10app): adjust application programs to new interface

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.

Adjust the application programs in src/ts/wf to the new interface using
libtsioxx. All programs compile successfully.

Missing:
 - The link rules in the Makefile are not well written.
   They repeat libraries in the link list, contain unnecessary libraries and
   targets are in this respect not well grouped.
parent 7f40d9c0
......@@ -54,13 +54,13 @@ PROGRAMS=tsfilt stufi rotate coro xyz2uvw susei suseix evelo \
autocorr cross tidofi sigfit noisymize sigval fidasexx soutifu \
deconv geophone sigscale tisli suspect
.PHONY: all
all: install doc
.PHONY: list-programs
list-programs:
echo $(PROGRAMS) | tr ' ' '\n' | sort
.PHONY: all
all: install doc
.PHONY: doc
doc: doxydoc
......@@ -172,12 +172,13 @@ suspect smoos dise: %: %.o
$(FC) $(FFLAGS) $(LDFLAGS) $< -o $@ \
-ltf -lsffu -ltime -lsff -lgsl -lm -lgslcblas
deconv foutra sigval: \
deconv foutra sigval sigift: \
%: %.o
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) -lfourierxx -lfftw3 -lm \
-lsffxx -ldatrwxx -llinearxx \
-ltsxx -ltfxx -lsffxx -lgsexx -ltime++ -laff \
-llapack -lblas -lcseife -lsffxx $(FOTRANLIB) -lm \
-ltsioxx -llinearxx \
-ltsxx -ltfxx \
-lcseife -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
-llapack -lblas \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS)
fregra: \
......@@ -187,21 +188,22 @@ fregra: \
-ltsxx -ltfxx -lsffxx -lgsexx -ltime++ -laff \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS)
sigscale teseco resaseda gatherdiff autocorr cross tidofi sigfit: \
sigscale teseco resaseda gatherdiff autocorr cross tidofi: \
%: %.o
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) -lsffxx -ldatrwxx -llinearxx \
-ltsxx -ltfxx -lsffxx -lgsexx -ltime++ -laff \
-llapack -lblas -lcseife -lsffxx $(FOTRANLIB) -lm \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS) \
$(TF_LINK_FORTRAN)
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) \
-ltsioxx \
-ltsxx -ltfxx \
-lcseife -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS)
noisymize: \
%: %.o
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) -lsffxx -ldatrwxx -llinearxx \
-ltsxx -ltfxx -lsffxx -lgsexx -ltime++ -laff \
-lgsl -lgslcblas -llapack \
-lcseife -lsffxx $(FOTRANLIB) -lm \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS)
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) \
-ltsioxx \
-ltsxx -ltfxx \
-lcseife -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
-lgsl -lgslcblas \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS)
fidasexx: fidasexx.o
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) -lpgplotCpp -lcpgplot \
......@@ -214,7 +216,7 @@ soutifu: soutifu.o
-lstfinv \
-lfourierxx -lfftw3 \
-llinearxx -llapack -lblas \
-ltfxx -ltsxx -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
-ltsioxx -ltfxx -ltsxx -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
-L$(LOCLIBDIR) $(CXXFLAGS) $(FLAGS) $(LDFLAGS)
geophone: %: %.o
......
......@@ -50,7 +50,7 @@
#include <tsxx/tsxx.h>
#include <tsxx/tapers.h>
#include <tsxx/filter.h>
#include <tsxx/sffheaders.h>
#include <tsioxx/inputoperators.h>
#include <fourier/fftwaff.h>
#include <datrwxx/readany.h>
......
......@@ -82,7 +82,7 @@
#include <tsxx/tsxx.h>
#include <tsxx/tapers.h>
#include <tsxx/filter.h>
#include <tsxx/sffheaders.h>
#include <tsioxx/inputoperators.h>
#include <fstream>
#include <tfxx/error.h>
#include <tfxx/rangestring.h>
......
......@@ -57,7 +57,7 @@
#include <aff/seriesoperators.h>
#include <tsxx/tsxx.h>
#include <tsxx/convolve.h>
#include <tsxx/sffheaders.h>
#include <tsioxx/inputoperators.h>
#include <tsxx/random.h>
#include <datrwxx/readany.h>
......
......@@ -58,7 +58,7 @@
#include <tsxx/tsxx.h>
#include <tsxx/tapers.h>
#include <tsxx/filter.h>
#include <tsxx/sffheaders.h>
#include <tsioxx/inputoperators.h>
#include <fstream>
#include <tfxx/error.h>
#include <tfxx/rangestring.h>
......
......@@ -44,7 +44,7 @@
#include <fstream>
#include <tfxx/error.h>
#include <tfxx/commandline.h>
#include <tsxx/sffheaders.h>
#include <tsioxx/inputoperators.h>
#include <datrwxx/readany.h>
#include <datrwxx/writeany.h>
#include <stfinv/stfinvany.h>
......
......@@ -46,7 +46,7 @@
#include <tfxx/error.h>
#include <tfxx/misc.h>
#include <tfxx/rangestring.h>
#include <tsxx/sffheaders.h>
#include <tsioxx/operators.h>
#include <datrwxx/readany.h>
#include <datrwxx/writeany.h>
#include <aff/series.h>
......
Markdown is supported
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