]>
Commit | Line | Data |
---|---|---|
cbad49cd JB |
1 | --- fftw-3.3/threads/Makefile.am.orig 2011-07-27 02:28:29.000000000 +0200 |
2 | +++ fftw-3.3/threads/Makefile.am 2011-07-28 20:21:46.135119454 +0200 | |
3 | @@ -26,9 +26,11 @@ | |
4 | vrank-geq1-rdft2.c f77api.c f77funcs.h | |
5 | libfftw3@PREC_SUFFIX@_threads_la_CFLAGS = $(PTHREAD_CFLAGS) | |
f2b41f11 | 6 | libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
cbad49cd JB |
7 | +libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(top_builddir)/libfftw3@PREC_SUFFIX@.la |
8 | ||
9 | libfftw3@PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c \ | |
10 | threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \ | |
11 | vrank-geq1-rdft2.c f77api.c f77funcs.h | |
12 | libfftw3@PREC_SUFFIX@_omp_la_CFLAGS = $(OPENMP_CFLAGS) | |
13 | libfftw3@PREC_SUFFIX@_omp_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ | |
14 | +libfftw3@PREC_SUFFIX@_omp_la_LIBADD = $(top_builddir)/libfftw3@PREC_SUFFIX@.la -lgomp | |
15 | --- fftw-3.3/Makefile.am.orig 2011-07-27 02:28:29.000000000 +0200 | |
16 | +++ fftw-3.3/Makefile.am 2011-07-28 20:18:54.851780384 +0200 | |
a46795d7 | 17 | @@ -13,8 +13,8 @@ |
c285567a | 18 | |
a46795d7 | 19 | ACLOCAL_AMFLAGS=-I m4 |
f2b41f11 | 20 | |
cbad49cd JB |
21 | -SUBDIRS=support $(GENFFT) kernel simd-support dft rdft reodft api \ |
22 | -threads libbench2 . tests mpi doc tools m4 | |
23 | +SUBDIRS=support $(GENFFT) kernel simd-support dft rdft reodft api . \ | |
24 | +threads libbench2 tests mpi doc tools m4 | |
25 | EXTRA_DIST=COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in | |
f2b41f11 | 26 | |
cbad49cd | 27 | SIMD_LIBS = \ |