From 764beb2e9f63e8191af2bd5da130ad65a6add36d Mon Sep 17 00:00:00 2001
From: jtb <jtb>
Date: Fri, 26 Jan 2001 22:19:35 +0000
Subject: Tidied up the Makefiles.

---
 math/dfftpack/Makefile       | 12 ++++--------
 math/dfftpack/files/Makefile | 18 ++++++++----------
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'math/dfftpack')

diff --git a/math/dfftpack/Makefile b/math/dfftpack/Makefile
index e12c44f184b..f09e5f10ae1 100644
--- a/math/dfftpack/Makefile
+++ b/math/dfftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/10 03:57:16 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/26 22:19:35 jtb Exp $
 
 DISTNAME=		dfftpack-20001209
 CATEGORIES=		math
@@ -6,17 +6,13 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		jtb@netbsd.org
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/dfftpack
-
 USE_FORTRAN=		YES
 USE_LIBTOOL=		YES
 
-.include "../../mk/bsd.prefs.mk"
-
-pre-build:
-	@${RM} -f ${WRKDIR}/dfftpack/Makefile
-	@${SED} -e 's:%%F77%%:'${FC}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+post-extract:
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dfftpack
diff --git a/math/dfftpack/files/Makefile b/math/dfftpack/files/Makefile
index 0f38683cc7b..900eb244086 100644
--- a/math/dfftpack/files/Makefile
+++ b/math/dfftpack/files/Makefile
@@ -1,12 +1,10 @@
-LIB = dfftpack
+LIB 	= dfftpack
 
 LIBDIR	= ${PREFIX}/lib
-F77	= %%F77%%
-FFLAGS	= -O3
 
-all:	lib$(LIB)
+all:	lib$(LIB).la
 
-OBJ = 	zfftb.o cfftb1.o zfftf.o cfftf1.o zffti.o cffti1.o dcosqb.o	\
+OBJS = 	zfftb.o cfftb1.o zfftf.o cfftf1.o zffti.o cffti1.o dcosqb.o	\
 	cosqb1.o dcosqf.o cosqf1.o dcosqi.o dcost.o dcosti.o ezfft1.o	\
 	dzfftb.o dzfftf.o dzffti.o passb.o passb2.o passb3.o passb4.o	\
 	passb5.o passf.o passf2.o passf3.o passf4.o passf5.o radb2.o	\
@@ -14,15 +12,15 @@ OBJ = 	zfftb.o cfftb1.o zfftf.o cfftf1.o zffti.o cffti1.o dcosqb.o	\
 	radf5.o radfg.o dfftb.o rfftb1.o dfftf.o rfftf1.o dffti.o	\
 	rffti1.o dsinqb.o dsinqf.o dsinqi.o dsint.o sint1.o dsinti.o
 
-lib$(LIB):	$(OBJ)
-	@$(LIBTOOL) --mode=link $(F77) -O -o lib$(LIB).la $(OBJ:.o=.lo) \
+lib$(LIB).la:	$(OBJS)
+	$(LIBTOOL) --mode=link $(FC) $(FFLAGS) -o $@ $(OBJ:.o=.lo) \
 	-rpath $(LIBDIR) --version-info 0:0
 
 .f.o:
-	@$(LIBTOOL) --mode=compile $(F77) $(FFLAGS) -c $*.f
+	$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c $*.f
 
-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
-- 
cgit v1.2.3