diff options
| author | jtb <jtb@pkgsrc.org> | 2001-01-22 23:30:01 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2001-01-22 23:30:01 +0000 |
| commit | 16441ea3917bf5ff23158b65aabcd939b0342780 (patch) | |
| tree | 2626c2011745ffc74684e4eeb27543e2ad7aa88e /math/fftpack/files | |
| parent | 39e5bd2d7c70faea8d2f34f5aa33d690dfb56c1f (diff) | |
| download | pkgsrc-16441ea3917bf5ff23158b65aabcd939b0342780.tar.gz | |
Roll the 13 trivial patches into one (save some inodes!). Clean it up a bit.
Diffstat (limited to 'math/fftpack/files')
| -rw-r--r-- | math/fftpack/files/Makefile | 24 | ||||
| -rw-r--r-- | math/fftpack/files/patch-sum | 16 |
2 files changed, 16 insertions, 24 deletions
diff --git a/math/fftpack/files/Makefile b/math/fftpack/files/Makefile index 26f8d31255a..c99278b9442 100644 --- a/math/fftpack/files/Makefile +++ b/math/fftpack/files/Makefile @@ -1,12 +1,16 @@ LIB = fftpack LIBDIR = ${PREFIX}/lib -FORTRAN = %%FORTRAN%% -FOPTS = -O3 -all: lib$(LIB) +.if $(FC)=="f77" || $(FC)=="g77" +FOPTS=-funroll-loops -O2 +.else +FOPTS=-O2 +.endif -OBJ = cfftb.o cosqf1.o passb2.o radb2.o radfg.o \ +all: lib$(LIB).la + +OBJS = cfftb.o cosqf1.o passb2.o radb2.o radfg.o \ sinqi.o cfftb1.o cosqi.o passb3.o radb3.o rfftb.o \ sint.o cfftf.o cost.o passb4.o radb4.o rfftb1.o \ sint1.o cfftf1.o costi.o passb5.o radb5.o rfftf.o \ @@ -16,15 +20,15 @@ OBJ = cfftb.o cosqf1.o passb2.o radb2.o radfg.o \ ezffti.o passf4.o radf4.o sinqb.o cosqf.o passb.o \ passf5.o radf5.o sinqf.o -lib$(LIB): $(OBJ) - @$(LIBTOOL) --mode=link $(FORTRAN) $(FFLAGS) $(FOPTS) \ - -O -o lib$(LIB).la $(OBJ:.o=.lo) --version-info 0:0 -rpath $(LIBDIR) +lib$(LIB).la: $(OBJS) + $(LIBTOOL) --mode=link $(FC) $(FFLAGS) $(FOPTS) \ + -o $@ $(OBJS:.o=.lo) -rpath $(LIBDIR) --version-info 0:0 .f.o: - @$(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) $(FOPTS) -c $< + $(LIBTOOL) --mode=compile $(FC) $(FFLAGS) $(FOPTS) -c $< -install: lib$(LIB) - @$(LIBTOOL) --mode=install install -c lib$(LIB).la $(LIBDIR) +install: lib$(LIB).la + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $? $(LIBDIR) clean: rm -rf *.o *.lo .libs lib$(LIB).la diff --git a/math/fftpack/files/patch-sum b/math/fftpack/files/patch-sum index eaadd99611f..9a69e1fc714 100644 --- a/math/fftpack/files/patch-sum +++ b/math/fftpack/files/patch-sum @@ -1,15 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/11/28 02:17:02 jtb Exp $ +$NetBSD: patch-sum,v 1.2 2001/01/22 23:30:02 jtb Exp $ -MD5 (patch-aa) = 2ce242bf4f6517e26ebfe052478aeec9 -MD5 (patch-ab) = a22c8f5b2db45ab0158e99b06f3597c2 -MD5 (patch-ac) = a03c41bcc139ba8354f31a588ffb7fdc -MD5 (patch-ad) = 3696c86d63c5a3172b7c243dd5d0be55 -MD5 (patch-ae) = 25ffafb4fb407e377d87d9b724ac26ac -MD5 (patch-af) = 95fc40b0e2c4c40ab63a081200e1a437 -MD5 (patch-ag) = e6a00232fa52bebd03097bdde5adb9ee -MD5 (patch-ah) = 78c1dc78af77b77a4f230911c422549c -MD5 (patch-ai) = 200a7967826bf87d9b241fef609e05f7 -MD5 (patch-aj) = 640b261c2017e9e0d1be71aa0b9931d5 -MD5 (patch-ak) = e667ba2273c8c192e9d3b460b8d70802 -MD5 (patch-al) = 0640528d8710ee8e0da7cd1926553000 -MD5 (patch-am) = da441cdff0119b5d8dcee2b852f245c1 +MD5 (patch-aa) = 3cc50a4e648fef18518a38cf2407c4f1 |