--- ./tools/Makefile.am.orig	2005-09-17 21:33:18.000000000 +1000
+++ ./tools/Makefile.am	2005-09-17 21:34:16.000000000 +1000
@@ -1,9 +1,9 @@
 noinst_PROGRAMS=ps_inspect ps_convert
 
 ps_inspect_SOURCES=ps_inspect.c
-ps_inspect_LDFLAGS=-L../src/tspi -ltspi
+ps_inspect_LDADD=../src/tspi/libtspi.la
 ps_inspect_CFLAGS=-I../src/include
 
 ps_convert_SOURCES=ps_convert.c
-ps_convert_LDFLAGS=-L../src/tspi -ltspi
+ps_convert_LDADD=../src/tspi/libtspi.la
 ps_convert_CFLAGS=-I../src/include
--- src/trspi/Makefile.am.orig	2005-09-17 22:45:56.000000000 +1000
+++ src/trspi/Makefile.am	2005-09-17 22:46:48.000000000 +1000
@@ -1,7 +1,7 @@
-noinst_LIBRARIES=libtrousers.a
+noinst_LTLIBRARIES=libtrousers.la
 
-libtrousers_a_SOURCES=trousers.c crypto/@CRYPTO_PACKAGE@/crypto.c
-libtrousers_a_CFLAGS=-DAPPID=\"TSPI\"
+libtrousers_la_SOURCES=trousers.c crypto/@CRYPTO_PACKAGE@/crypto.c
+libtrousers_la_CFLAGS=-DAPPID=\"TSPI\"
 
 clean:
 	rm -f libtrousers.a *.o crypto/*/*.o
--- src/tspi/Makefile.am.orig	2005-09-17 22:47:14.000000000 +1000
+++ src/tspi/Makefile.am	2005-09-17 22:48:13.000000000 +1000
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES=libtspi.la
 
-libtspi_la_LIBADD=../trspi/libtrousers.a
+libtspi_la_LIBADD=../trspi/libtrousers.la
 
 # On setting -version-info, from the libtool manual:
 #