--- dao/Makefile.am.ori	Sat Aug 18 20:40:37 2007
+++ dao/Makefile.am	Sat Aug 18 20:41:11 2007
@@ -78,8 +78,8 @@
 
 cdrdao_LDADD =						\
 	-L. -ldao					\
-	-L$(top_builddir)/paranoia -lcdda_paranoia	\
-	-L$(top_builddir)/trackdb -ltrackdb		\
+	$(top_builddir)/paranoia/libcdda_paranoia.a	\
+	$(top_builddir)/trackdb/libtrackdb.a		\
 	@thread_libs@					\
 	@scsilib_libs@
 
--- dao/Makefile.in.orig	Sat Aug 18 20:46:24 2007
+++ dao/Makefile.in	Sat Aug 18 20:50:21 2007
@@ -315,8 +315,8 @@
 libdao_a_DEPENDENCIES = \
 	@scsilib_objs@
 
-cdrdao_LDADD = -L. -ldao -L$(top_builddir)/paranoia -lcdda_paranoia \
-	-L$(top_builddir)/trackdb -ltrackdb @thread_libs@ \
+cdrdao_LDADD = -L. -ldao $(top_builddir)/paranoia/libcdda_paranoia.a \
+	$(top_builddir)/trackdb/libtrackdb.a @thread_libs@ \
 	@scsilib_libs@ $(am__append_1) $(am__append_2) @AO_LIBS@
 cdrdao_DEPENDENCIES = \
 	$(top_builddir)/paranoia/libcdda_paranoia.a	\