[nfft] 01/06: Imported Upstream version 3.3.0~alpha2
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jan 15 11:59:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian-experimental
in repository nfft.
commit 866c02f32125784bdeab6f61c5262ad214be8382
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Jan 15 11:28:57 2015 +0000
Imported Upstream version 3.3.0~alpha2
---
Makefile.am | 25 +++----------------------
applications/fastsumS2/Makefile.am | 2 +-
applications/mri/mri2d/Makefile.am | 16 ++++++++--------
applications/mri/mri3d/Makefile.am | 4 ++--
configure.ac | 21 ++++++++++++---------
doc/logo/nfft_logo.tif | Bin 56256 -> 0 bytes
doc/tutorial/tutorial.pdf | Bin 0 -> 1051948 bytes
tests/CUnitAutomated-Results.xml | 34 ----------------------------------
tests/Makefile.am | 2 +-
tests/checkall | Bin 497396 -> 0 bytes
10 files changed, 27 insertions(+), 77 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 135cf92..01e7dac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,12 +69,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = nfft3 at PREC_SUFFIX@.pc
install-data-hook:
- chmod u+wX $(prefix)
- $(install_sh) -d $(datarootdir)
- chmod -R u+wX $(datarootdir)
- $(install_sh) -d $(docdir)
- chmod -Rf u+rwX $(srcdir)/doc
- cp -R $(srcdir)/doc/* $(docdir)/
+ $(MKDIR_P) $(DESTDIR)$(docdir)
+ cp -R $(srcdir)/doc/* $(DESTDIR)$(docdir)/
uninstall-hook:
rm -Rf $(docdir)
@@ -92,7 +88,7 @@ maintainer-clean-local:
rm -f $(srcdir)/doc/api/latex/Makefile
dist-hook:
- if test ! -f "$(srcdir)/doc/tutorial/tutorial.pdf"; then \
+ if test ! -f "$(srcdir)/doc/api/html/index.html"; then \
chmod -Rf u+rwX $(srcdir)/doc; \
sed 's/^ \* \\section \([a-zA-Z0-9_]*\) \(.*\)/<ul><li><a href="#\1">\2<\/a><\/li><\/ul>/' < $(srcdir)/doxygen.dox > $(srcdir)/doc/api/html/toc.txt; \
sed 's/^ \* \\subsection \([a-zA-Z0-9_]*\) \(.*\)/<ul><ul><li><a href="#\1">\2<\/a><\/li><\/ul><\/ul>/' < $(srcdir)/doxygen.dox > $(srcdir)/doc/api/html/toc.txt; \
@@ -103,16 +99,6 @@ dist-hook:
mv $(srcdir)/doc/api/html/index.html.new $(srcdir)/doc/api/html/index.html; \
cp -R $(srcdir)/doc $(distdir)/; \
rm -Rf `find $(distdir) -name .svn -type d`; \
- pwd; \
- echo $(distdir); \
- echo $(top_srcdir); \
- echo $(srcdir); \
- (cd $(distdir)/doc/tutorial && pdflatex paper.tex); \
- mv $(distdir)/doc/tutorial/paper.pdf $(distdir)/doc/tutorial.pdf; \
- rm -Rf $(distdir)/doc/tutorial/*; \
- mv $(distdir)/doc/tutorial.pdf $(distdir)/doc/tutorial/tutorial.pdf; \
- rm -Rf $(distdir)/doc/logo; \
- rm -Rf $(distdir)/doc/api/latex; \
else \
cp -R $(srcdir)/doc $(distdir)/; \
fi
@@ -121,8 +107,3 @@ doc:
# Flags to be passed to aclocal.
ACLOCAL_AMFLAGS = -I m4
-
-#distclean-local:
-# rm -Rf `find $(builddir) -type f -name *.Po`
-# rm -Rf `find $(builddir) -type f -name Makefile`
-
diff --git a/applications/fastsumS2/Makefile.am b/applications/fastsumS2/Makefile.am
index 2c5c140..f881e82 100644
--- a/applications/fastsumS2/Makefile.am
+++ b/applications/fastsumS2/Makefile.am
@@ -5,6 +5,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = fastsumS2
fastsumS2_SOURCES = fastsumS2.c doxygen.h
-fastsumS2_LDADD = $(top_builddir)/libnfft3.la
+fastsumS2_LDADD = $(top_builddir)/libnfft3.la -lm
EXTRA_DIST = fastsumS2.m writeTestcase.m readTestcase.m README example.in example.out
diff --git a/applications/mri/mri2d/Makefile.am b/applications/mri/mri2d/Makefile.am
index dbedf85..530f565 100644
--- a/applications/mri/mri2d/Makefile.am
+++ b/applications/mri/mri2d/Makefile.am
@@ -13,28 +13,28 @@ noinst_PROGRAMS = \
reconstruct_data_inh_nnfft
construct_data_2d_SOURCES = construct_data_2d.c doxygen.h
-construct_data_2d_LDADD = $(top_builddir)/libnfft3.la
+construct_data_2d_LDADD = $(top_builddir)/libnfft3.la -lm
construct_data_inh_2d1d_SOURCES = construct_data_inh_2d1d.c
-construct_data_inh_2d1d_LDADD = $(top_builddir)/libnfft3.la
+construct_data_inh_2d1d_LDADD = $(top_builddir)/libnfft3.la -lm
construct_data_inh_3d_SOURCES = construct_data_inh_3d.c
-construct_data_inh_3d_LDADD = $(top_builddir)/libnfft3.la
+construct_data_inh_3d_LDADD = $(top_builddir)/libnfft3.la -lm
reconstruct_data_gridding_SOURCES = reconstruct_data_gridding.c
-reconstruct_data_gridding_LDADD = $(top_builddir)/libnfft3.la
+reconstruct_data_gridding_LDADD = $(top_builddir)/libnfft3.la -lm
reconstruct_data_2d_SOURCES = reconstruct_data_2d.c
-reconstruct_data_2d_LDADD = $(top_builddir)/libnfft3.la
+reconstruct_data_2d_LDADD = $(top_builddir)/libnfft3.la -lm
reconstruct_data_inh_3d_SOURCES = reconstruct_data_inh_3d.c
-reconstruct_data_inh_3d_LDADD = $(top_builddir)/libnfft3.la
+reconstruct_data_inh_3d_LDADD = $(top_builddir)/libnfft3.la -lm
reconstruct_data_inh_2d1d_SOURCES = reconstruct_data_inh_2d1d.c
-reconstruct_data_inh_2d1d_LDADD = $(top_builddir)/libnfft3.la
+reconstruct_data_inh_2d1d_LDADD = $(top_builddir)/libnfft3.la -lm
reconstruct_data_inh_nnfft_SOURCES = reconstruct_data_inh_nnfft.c
-reconstruct_data_inh_nnfft_LDADD = $(top_builddir)/libnfft3.la
+reconstruct_data_inh_nnfft_LDADD = $(top_builddir)/libnfft3.la -lm
EXTRA_DIST = construct_inh.m \
construct_readout_time.m \
diff --git a/applications/mri/mri3d/Makefile.am b/applications/mri/mri3d/Makefile.am
index cd662e7..d167daa 100644
--- a/applications/mri/mri3d/Makefile.am
+++ b/applications/mri/mri3d/Makefile.am
@@ -13,7 +13,7 @@ construct_data_2d1d_SOURCES = construct_data_2d1d.c doxygen.h
construct_data_2d1d_LDADD = $(top_builddir)/libnfft3.la @fftw3_LDFLAGS@ @fftw3_LIBS@
construct_data_3d_SOURCES = construct_data_3d.c
-construct_data_3d_LDADD = $(top_builddir)/libnfft3.la
+construct_data_3d_LDADD = $(top_builddir)/libnfft3.la -lm
reconstruct_data_gridding_SOURCES = reconstruct_data_gridding.c
reconstruct_data_gridding_LDADD = $(top_builddir)/libnfft3.la @fftw3_LDFLAGS@ @fftw3_LIBS@
@@ -22,7 +22,7 @@ reconstruct_data_2d1d_SOURCES = reconstruct_data_2d1d.c
reconstruct_data_2d1d_LDADD = $(top_builddir)/libnfft3.la @fftw3_LDFLAGS@ @fftw3_LIBS@
reconstruct_data_3d_SOURCES = reconstruct_data_3d.c
-reconstruct_data_3d_LDADD = $(top_builddir)/libnfft3.la
+reconstruct_data_3d_LDADD = $(top_builddir)/libnfft3.la -lm
EXTRA_DIST = mri.m \
construct_knots_linogram.m \
diff --git a/configure.ac b/configure.ac
index 42c6d2d..bb298cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ AC_SUBST(PREC_SUFFIX)
need_fpt="no"
# build all modules by default in maintainer mode or if option is given
-AC_ARG_ENABLE(all, [AC_HELP_STRING([--enable-all],[build all modules])],
+AC_ARG_ENABLE(all, [AC_HELP_STRING([--enable-all],[build all modules])],
ok=$enableval, ok=$USE_MAINTAINER_MODE)
nfft_module_default=$ok
@@ -173,7 +173,7 @@ if test "x$ok" = "xyes"; then
fi
AC_ARG_ENABLE(mips_zbus_timer, [AC_HELP_STRING([--enable-mips-zbus-timer],
- [use MIPS ZBus cycle-counter])], have_mips_zbus_timer=$enableval,
+ [use MIPS ZBus cycle-counter])], have_mips_zbus_timer=$enableval,
have_mips_zbus_timer=no)
if test "$have_mips_zbus_timer" = "yes"; then
AC_DEFINE(HAVE_MIPS_ZBUS_TIMER,1,
@@ -244,6 +244,9 @@ AM_PROG_AS
# BSD-compatible install
AC_PROG_INSTALL
+# mkdir
+AC_PROG_MKDIR_P
+
# whether ln -s works
AC_PROG_LN_S
@@ -317,7 +320,7 @@ if test "x${enable_debug}" = "xyes"; then
fi
# add gcc warnings, in debug/maintainer mode only
-if test "x${enable_debug}" = "xyes" || test "x$USE_MAINTAINER_MODE" = "xyes";
+if test "x${enable_debug}" = "xyes" || test "x$USE_MAINTAINER_MODE" = "xyes";
then
if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
CFLAGS="$CFLAGS -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
@@ -329,7 +332,7 @@ then
fi
# option to accept C99
-CFLAGS="$CFLAGS $ac_cv_prog_cc_c99"
+CFLAGS="$CFLAGS $ac_cv_prog_cc_c99"
CPPFLAGS="$CPPFLAGS $fftw3_CPPFLAGS"
@@ -339,7 +342,7 @@ if test "x$ax_prog_matlab" = "xyes"; then
fi
################################################################################
-# check if mex.h can be included without undefinition of
+# check if mex.h can be included without undefinition of
################################################################################
ax_prog_matlab_gcc_require_undef_stdc_utf_16=no
if test "x$ax_prog_matlab" = "xyes"; then
@@ -403,7 +406,7 @@ AC_FUNC_ALLOCA
AC_FUNC_STRTOD
AC_FUNC_VPRINTF
saved_LIBS=$LIBS
-AC_CHECK_LIB(m, sin)
+AC_CHECK_LIB(m, sin, [])
LIBS=$saved_LIBS
AC_CHECK_FUNCS([gethrtime read_real_time time_base_to_time clock_gettime mach_absolute_time])
@@ -481,7 +484,7 @@ AC_SUBST(TICKS_PER_SECOND)
if test "$PRECISION" = "l"; then
#AC_CHECK_FUNCS([copysignl nextafterl nanl ceill floorl nearbyintl rintl roundl lrintl lroundl llrintl llroundl truncl fmodl remainderl remquol fdiml fmaxl fminl fmal fabsl sqrtl cbrtl hypotl expl exp2l expm1l logl log2l log10l log1pl logbl ilogbl modfl frexpl ldexpl scalbnl scalblnl powl cosl sinl tanl coshl sinhl tanhl acosl asinl atanl atan2l acoshl asinhl atanhl tgammal lgammal j0l j1l jnl jnl y0l y1l ynl erfl erfcl creall cimagl cabsl cargl conjl cprojl csqrtl cexpl clogl cpowl csin [...]
AC_CHECK_DECLS([copysignl, nextafterl, nanl, ceill, floorl, nearbyintl, rintl, roundl, lrintl, lroundl, llrintl, llroundl, truncl, fmodl, remainderl, remquol, fdiml, fmaxl, fminl, fmal, fabsl, sqrtl, cbrtl, hypotl, expl, exp2l, expm1l, logl, log2l, log10l, log1pl, logbl, ilogbl, modfl, frexpl, ldexpl, scalbnl, scalblnl, powl, cosl, sinl, tanl, coshl, sinhl, tanhl, acosl, asinl, atanl, atan2l, acoshl, asinhl, atanhl, tgammal, lgammal, j0l, j1l, jnl, y0l, y1l, ynl, erfl, erfcl, creall, cim [...]
- [#include <math.h>
+ [#include <math.h>
#include <complex.h>])
fi
@@ -495,7 +498,7 @@ fi
if test "$PRECISION" = "s"; then
#AC_CHECK_FUNCS([copysignf nextafterf nanf ceilf floorf nearbyintf rintf roundf lrintf lroundf llrintf llroundf truncf fmodf remainderf remquof fdimf fmaxf fminf fmaf fabsf sqrtf cbrtf hypotf expf exp2f expm1f logf log2f log10f log1pf logbf ilogbf modff frexpf ldexpf scalbnf scalblnf powf cosf sinf tanf coshf sinhf tanhf acosf asinf atanf atan2f acoshf asinhf atanhf tgammaf lgammaf j0f j1f jnf y0f y1f ynf erff erfcf crealf cimagf cabsf cargf conjf cprojf csqrtf cexpf clogf cpowf csinf cc [...]
AC_CHECK_DECLS([copysignf, nextafterf, nanf, ceilf, floorf, nearbyintf, rintf, roundf, lrintf, lroundf, llrintf, llroundf, truncf, fmodf, remainderf, remquof, fdimf, fmaxf, fminf, fmaf, fabsf, sqrtf, cbrtf, hypotf, expf, exp2f, expm1f, logf, log2f, log10f, log1pf, logbf, ilogbf, modff, frexpf, ldexpf, scalbnf, scalblnf, powf, cosf, sinf, tanf, coshf, sinhf, tanhf, acosf, asinf, atanf, atan2f, acoshf, asinhf, atanhf, tgammaf, lgammaf, j0f, j1f, jnf, y0f, y1f, ynf, erff, erfcf, crealf, cim [...]
- [#include <math.h>
+ [#include <math.h>
#include <complex.h>])
fi
@@ -550,7 +553,7 @@ AC_CONFIG_FILES(Makefile \
matlab/Makefile \
matlab/nfsft/Makefile \
matlab/nfft/Makefile \
- matlab/nnfft/Makefile \
+ matlab/nnfft/Makefile \
matlab/nfsft/@f_hat/Makefile \
matlab/nfsoft/Makefile \
doxygen/Makefile \
diff --git a/doc/logo/nfft_logo.tif b/doc/logo/nfft_logo.tif
deleted file mode 100644
index 76c053e..0000000
Binary files a/doc/logo/nfft_logo.tif and /dev/null differ
diff --git a/doc/tutorial/tutorial.pdf b/doc/tutorial/tutorial.pdf
new file mode 100644
index 0000000..d4abd3d
Binary files /dev/null and b/doc/tutorial/tutorial.pdf differ
diff --git a/tests/CUnitAutomated-Results.xml b/tests/CUnitAutomated-Results.xml
deleted file mode 100644
index 7fe2aaf..0000000
--- a/tests/CUnitAutomated-Results.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" ?>
-<?xml-stylesheet type="text/xsl" href="CUnit-Run.xsl" ?>
-<!DOCTYPE CUNIT_TEST_RUN_REPORT SYSTEM "CUnit-Run.dtd">
-<CUNIT_TEST_RUN_REPORT>
- <CUNIT_HEADER/>
- <CUNIT_RESULT_LISTING>
- <CUNIT_RUN_SUITE>
- <CUNIT_RUN_SUITE_SUCCESS>
- <SUITE_NAME> nfft </SUITE_NAME>
- <CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_SUCCESS>
- <TEST_NAME> nfft_1d_direct_file </TEST_NAME>
- </CUNIT_RUN_TEST_SUCCESS>
- </CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_SUCCESS>
- <TEST_NAME> nfft_1d_fast_file </TEST_NAME>
- </CUNIT_RUN_TEST_SUCCESS>
- </CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_SUCCESS>
- <TEST_NAME> nfft_adjoint_1d_direct_file </TEST_NAME>
- </CUNIT_RUN_TEST_SUCCESS>
- </CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_SUCCESS>
- <TEST_NAME> nfft_adjoint_1d_fast_file </TEST_NAME>
- </CUNIT_RUN_TEST_SUCCESS>
- </CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_RECORD>
- <CUNIT_RUN_TEST_SUCCESS>
- <TEST_NAME> nfft_1d_online </TEST_NAME>
- </CUNIT_RUN_TEST_SUCCESS>
- </CUNIT_RUN_TEST_RECORD>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3b3e26b..6eeef77 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,7 +38,7 @@ else
endif
checkall_SOURCES = check.c bspline.c bspline.h bessel.c bessel.h nfft.c nfft.h $(NFCT_SOURCES) $(NFST_SOURCES)
-checkall_LDADD = $(top_builddir)/libnfft3 at PREC_SUFFIX@.la -lcunit -lncurses
+checkall_LDADD = $(top_builddir)/libnfft3 at PREC_SUFFIX@.la -lm -lcunit -lncurses
if HAVE_THREADS
if HAVE_OPENMP
diff --git a/tests/checkall b/tests/checkall
deleted file mode 100755
index 130a225..0000000
Binary files a/tests/checkall and /dev/null differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nfft.git
More information about the debian-science-commits
mailing list