--- Makefile.in	2003-10-12 09:05:59.000000000 +0200
+++ Makefile.in.oden	2007-08-01 17:18:45.000000000 +0200
@@ -5,41 +5,48 @@
 
 CC = @CC@
 CFLAGS = @CFLAGS@ -Wall
+LDFLAGS = @LDFLAGS@
+LIBTOOL = libtool
 
 LIBS = @LIBS@ -lm
 
 AR = @AR@
 RANLIB = @RANLIB@
+DESTDIR=
 srcdir=@srcdir@
+libdir=@libdir@
+includedir=@includedir@
+bindir=@bindir@
 
 OBJS = \
-	src/resample.c.o \
-	src/resamplesubs.c.o \
-	src/filterkit.c.o
+	src/resample.lo \
+	src/resamplesubs.lo \
+	src/filterkit.lo
 
 TARGETS = @TARGETS@
 DIRS=tests
 
 all: $(TARGETS)
 
-libresample.a: $(OBJS) Makefile
-	$(AR) ruv libresample.a $(OBJS)
-	ranlib libresample.a
+libresample.a: libresample.la
 
-tests/testresample: libresample.a $(srcdir)/tests/testresample.c $(DIRS)
-	$(CC) -o tests/testresample \
+libresample.la: $(OBJS) Makefile
+	$(LIBTOOL) --tag=$(CC) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -rpath $(libdir)
+
+tests/testresample: libresample.la $(srcdir)/tests/testresample.c $(DIRS)
+	$(LIBTOOL) --tag=$(CC) --mode=link $(CC) $(LDFLAGS) -o tests/testresample \
 		$(CFLAGS) $(srcdir)/tests/testresample.c \
-		libresample.a $(LIBS)
+		libresample.la $(LIBS)
 
-tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c $(DIRS)
-	$(CC) -o tests/compareresample \
+tests/compareresample: libresample.la $(srcdir)/tests/compareresample.c $(DIRS)
+	$(LIBTOOL) --tag=$(CC) --mode=link $(CC) $(LDFLAGS) -o tests/compareresample \
 		$(CFLAGS) $(srcdir)/tests/compareresample.c \
-		libresample.a -lsamplerate $(LIBS)
+		libresample.la -lsamplerate $(LIBS)
 
-tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c $(DIRS)
-	$(CC) -o tests/resample-sndfile \
+tests/resample-sndfile: libresample.la $(srcdir)/tests/resample-sndfile.c $(DIRS)
+	$(LIBTOOL) --tag=$(CC) --mode=link $(CC) $(LDFLAGS) -o tests/resample-sndfile \
 		$(CFLAGS) $(srcdir)/tests/resample-sndfile.c \
-		libresample.a -lsndfile $(LIBS)
+		libresample.la -lsndfile $(LIBS)
 
 $(DIRS):
 	mkdir $(DIRS)
@@ -47,11 +54,19 @@
 clean:
 	rm -f $(TARGETS) $(OBJS)
 
+install: $(TARGETS)
+	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	install -m644 include/libresample.h $(DESTDIR)$(includedir)
+	$(LIBTOOL) --mode=install install libresample.la $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=install install tests/compareresample $(DESTDIR)$(bindir)
+	$(LIBTOOL) --mode=install install tests/resample-sndfile $(DESTDIR)$(bindir)
+	$(LIBTOOL) --mode=install install tests/testresample $(DESTDIR)$(bindir)
+
 dist: clean
 	rm -f Makefile
 	rm -f config.status config.cache config.log src/config.h
 	rm -f *~ src/*~ tests/*~ include/*~
 
-$(OBJS): %.c.o: $(srcdir)/%.c Makefile $(srcdir)/include/libresample.h \
+$(OBJS): %.lo: $(srcdir)/%.c Makefile $(srcdir)/include/libresample.h \
 	$(srcdir)/src/resample_defs.h $(srcdir)/src/filterkit.h $(srcdir)/src/config.h
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(LIBTOOL) --tag=$(CC) --mode=compile $(CC) -c $(CFLAGS) $< -o $@