$NetBSD: patch-ab,v 1.4 2002/03/04 14:45:13 itohy Exp $

--- Makefile.in.orig	Wed Mar 28 07:46:58 2001
+++ Makefile.in	Sun Mar  3 23:08:01 2002
@@ -3,12 +3,12 @@
 # DO NOT EDIT BELOW! ##########################################################
 # (unless, of course, you know what you are doing :) ##########################
 
-VERSION=9.8
+VERSION=98
 VPATH=@srcdir@
 srcdir=@srcdir@
 
 @SET_MAKE@
-FLAGS=@TYPESIZES@ @CFLAGS@
+FLAGS=@GETOPT_LONG@ @RAWPART@ @TYPESIZES@ @CFLAGS@
 OPT=@OPT@ $(FLAGS)
 DEBUG=@DEBUG@ $(FLAGS)
 CC=@CC@
@@ -27,29 +27,29 @@
 
 OFILES = main.o report.o header.o buffering_write.o
 
-export STATIC 
 export VERSION
 
-ifeq ($(STATIC),TRUE)
-	LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
-		-static -lm
-	LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
-else
-	LIBS = -lcdda_interface -lcdda_paranoia -lm
-	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
-endif
+STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a @LIBUTIL@ -lm
+STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 
+SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la
+SHLIBS = $(SHLIBDEP) @LIBUTIL@ -lm
 
-all: 	
+
+all:
 	cd interface && $(MAKE) all
 	cd paranoia && $(MAKE) all
-	$(MAKE) cdparanoia CFLAGS="$(OPT)" 
-	strip cdparanoia
+	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
+
+static:
+	cd interface && $(MAKE) lib
+	cd paranoia && $(MAKE) lib
+	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
 
-debug:  
+debug:
 	cd interface && $(MAKE) debug
 	cd paranoia && $(MAKE) debug
-	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" STATIC=TRUE
+	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
 
 test:	
 	cd interface && $(MAKE) all
@@ -65,31 +65,20 @@
 
 install:
 	$(INSTALL) -d -m 0755 $(BINDIR)
-	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
 	$(INSTALL) -d -m 0755 $(MANDIR)
 	$(INSTALL) -d -m 0755 $(MANDIR)/man1
 	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
 	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
 	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
 	$(INSTALL) -d -m 0755 $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.la $(LIBDIR)
 	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.la $(LIBDIR)
 	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
-	ln -fs libcdda_interface.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_interface.so.0
-	ln -fs libcdda_interface.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_interface.so
-	ln -fs libcdda_paranoia.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_paranoia.so.0
-	ln -fs libcdda_paranoia.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_paranoia.so
 
 cdparanoia:	$(OFILES) $(LIBDEP)
-		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
-		-L$(PWD)/paranoia -L$(PWD)/interface \
+		$(LIBTOOL) --mode=link $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
 		-o cdparanoia $(LIBS)
 
 .c.o: