Use "bsd.lib.mk" instead of libtool.

4 files changed, 31 insertions, 44 deletions

diff --git a/math/meschach/Makefile b/math/meschach/Makefile
index e0ec7eda6d1..a45dcf3801f 100644
--- a/math/meschach/Makefile
+++ b/math/meschach/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 21:40:21 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/27 18:42:05 jtb Exp $
 
 DISTNAME=		mesch12b
 PKGNAME=		meschach-1.2b
@@ -9,13 +9,10 @@ MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.math.uiowa.edu/~dstewart/meschach/
 COMMENT=		Library of C Routines for Matrix Computations
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
-GNU_CONFIGURE=		#defined
 WRKSRC=			${WRKDIR}
+GNU_CONFIGURE=		#defined
+CONFIGURE_ARGS+=	--with-all
 MAKEFILE=		makefile
-USE_LIBTOOL=		#defined
-
-CONFIGURE_ARGS+=	"--with-all"
 
 pre-patch:
 	${CP} ${FILESDIR}/makefile.in ${WRKSRC}
@@ -44,7 +41,7 @@ post-install:
 	${ECHO} $$i; $$i;						\
 	done
 	${INSTALL_DATA} ${WRKSRC}/copyright ${PREFIX}/share/meschach
-	@for f in tutadv.c tutorial.c ; do				\
+	@for f in tutadv.c tutorial.c; do				\
 	i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/meschach/";	\
 	${ECHO} $$i; $$i;						\
 	done
diff --git a/math/meschach/files/makefile.in b/math/meschach/files/makefile.in
index 31d10afae7e..55708284283 100644
--- a/math/meschach/files/makefile.in
+++ b/math/meschach/files/makefile.in
@@ -1,34 +1,26 @@
-CC = @CC@
+LIB= meschach
 
-DEFS = @DEFS@
-LIBS = @LIBS@
-LIBDIR = ${PREFIX}/lib
+SHLIB_MAJOR= 0
+SHLIB_MINOR= 0
 
-OBJ =   copy.o err.o matrixio.o memory.o vecop.o matop.o pxop.o		   \
-	submat.o init.o otherio.o machine.o matlab.o ivecop.o version.o	   \
-	meminfo.o memstat.o lufactor.o bkpfacto.o chfactor.o qrfactor.o	   \
-	solve.o hsehldr.o givens.o update.o norm.o hessen.o symmeig.o	   \
-	schur.o svd.o fft.o mfunc.o bdfactor.o sparse.o sprow.o sparseio.o \
-	spchfctr.o splufctr.o spbkp.o spswap.o iter0.o itersym.o	   \
-	iternsym.o zmachine.o zcopy.o zmatio.o zmemory.o zvecop.o zmatop.o \
-	znorm.o zfunc.o zlufctr.o zsolve.o zmatlab.o zhsehldr.o		   \
-	zqrfctr.o zgivens.o zhessen.o zschur.o conjgrad.o lanczos.o	   \
-	arnoldi.o
+CPPFLAGS+= @DEFS@
+LDADD+= @LIBS@
 
-all:	libmeschach.la
+LIBDIR= ${PREFIX}/lib
 
-libmeschach.la: $(OBJ)
-	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $(OBJ:.o=.lo) -lm \
-	-rpath $(LIBDIR) --version-info 0:0
+NOLINT= 1
+MKPICINSTALL= no
+MKPROFILE= no
 
-install: libmeschach.la
-	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $? $(LIBDIR)
-
-.c.o:
-	$(LIBTOOL) $(CC) -c $(CFLAGS) $(DEFS) $<
-
-clean:
-	rm -fr *.o *.lo *.core asx5213a.mat iotort.dat *.la
-	rm -fr torture sptort ztorture memtort itertort mfuntort iotort
-	rm -fr makefile machine.h config.status maxint macheps
+SRCS=  copy.c err.c matrixio.c memory.c vecop.c matop.c pxop.c		   \
+	submat.c init.c otherio.c machine.c matlab.c ivecop.c version.c	   \
+	meminfo.c memstat.c lufactor.c bkpfacto.c chfactor.c qrfactor.c	   \
+	solve.c hsehldr.c givens.c update.c norm.c hessen.c symmeig.c	   \
+	schur.c svd.c fft.c mfunc.c bdfactor.c sparse.c sprow.c sparseio.c \
+	spchfctr.c splufctr.c spbkp.c spswap.c iter0.c itersym.c	   \
+	iternsym.c zmachine.c zcopy.c zmatio.c zmemory.c zvecop.c zmatop.c \
+	znorm.c zfunc.c zlufctr.c zsolve.c zmatlab.c zhsehldr.c		   \
+	zqrfctr.c zgivens.c zhessen.c zschur.c conjgrad.c lanczos.c	   \
+	arnoldi.c
 
+.include <bsd.lib.mk>
diff --git a/math/meschach/files/makefile.test b/math/meschach/files/makefile.test
index 2a9924ccb95..df5ebfea33d 100644
--- a/math/meschach/files/makefile.test
+++ b/math/meschach/files/makefile.test
@@ -1,15 +1,14 @@
-LIBS = -Wl,-R@PREFIX@/lib -L@PREFIX@/lib -lmeschach -lm
+TORTURE= torture sptort ztorture memtort itertort mfuntort iotort
 
-CFLAGS += -I@PREFIX@/include -O2 -ansi
+CPPFLAGS+= -I@PREFIX@/include
 
-TORTURE = torture sptort ztorture memtort itertort mfuntort iotort
-
-TORTURE_O = $(TORTURE:=.o)
+LDFLAGS+= -Wl,-R@PREFIX@/lib -L@PREFIX@/lib
+LIBS= -lmeschach -lm
 
 all: $(TORTURE)
 
-$(TORTURE): $(TORTURE_O)
-	$(CC) $(CFLAGS) $@.o $(LIBS) -o $@
+$(TORTURE): $(TORTURE:=.o)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $@.o $(LDFLAGS) $(LIBS) -o $@
 
 clean:
 	rm -fr *.o *.core iotort.dat torture sptort ztorture \
diff --git a/math/meschach/pkg/PLIST b/math/meschach/pkg/PLIST
index 05d7ce1c2e2..6e5b2f3f738 100644
--- a/math/meschach/pkg/PLIST
+++ b/math/meschach/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:49 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/27 18:42:05 jtb Exp $
 include/meschach/err.h
 include/meschach/iter.h
 include/meschach/machine.h
@@ -12,7 +12,6 @@ include/meschach/sparse2.h
 include/meschach/zmatrix.h
 include/meschach/zmatrix2.h
 lib/libmeschach.a
-lib/libmeschach.la
 lib/libmeschach.so
 lib/libmeschach.so.0
 lib/libmeschach.so.0.0