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

[MERGE] (stf_issue12|master): bring in recent updates

parents 98b33008 6a5d3486
......@@ -162,7 +162,7 @@ include $(patsubst %.cc,%.d,$(wildcard *.cc))
# typical combinations of libraries
LIBDATRWXX=-ldatrwxx -lsffxx -ltime++ -lgsexx -laff
LIBFAPIDXX=-lfapidxx $(LIBDATRWXX)
LIBTSIOXX=-ltsioxx -ltsxx -ltfxx $(LIBDATRWXX)
LIBTSIOXX=-ltsioxx -ltsxx -ltfxx $(LIBDATRWXX) -lgsl -lgslcblas
#----------------------------------------------------------------------
# binary executable targets
......@@ -232,12 +232,12 @@ teseco: \
noisymize: \
%: %.o
$(LINK.cpp) $^ $(LOADLIBES) $(LDLIBS) -o $@ \
$(LIBTSIOXX) -lgsl -lgslcblas
$(LIBTSIOXX)
fregra foutra deconv: \
%: %.o
$(LINK.cpp) $^ $(LOADLIBES) $(LDLIBS) -o $@ \
-lfourierxx $(LIBTSIOXX) -lfftw3
-lfourierxx $(LIBTSIOXX) -lfftw3
soutifu: \
%: %.o
......@@ -291,33 +291,4 @@ doxydoc: $(DOXYWWWPATH)/html/index.html
doxyview: $(DOXYWWWPATH)/html/index.html
$(TF_BROWSER) file:$< &
#======================================================================
# create package
# --------------
# is delegated to Makefile.packages
# pass PACKAGESRCONLY=yes for a source code package
ifdef TF_MAKEPKG
export PACKAGENEEDSPGPLOT=yes
export PACKAGELINKSFORTRAN=yes
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
PACKAGE=tswf \
PACKAGEEXPORT="trunk/src/ts/wf:src" \
PACKAGETARGETS="src:all" \
PACKAGELIBS="-"
.PHONY: fullpackage
fullpackage: $(TF_MAKEPKG)
$(MAKE) -f $< \
PACKAGE=tswfwithlibs \
PACKAGEEXPORT="trunk/src/ts/wf:src" \
PACKAGETARGETS="src:all" \
PACKAGELIBS="libtfxx:\
libgsexx:libaff:libtime:libsffxx:libdatrwxx:libfapidxx:\
libfourier:\
liblinearxx:libpgplot++: \
libseife:libsff:libsffu:libtf:libstfinv:\
libtsxx:libtsioxx"
endif
# ----- END OF Makefile -----
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