diff -Naur amanda-2.5.1/amandad-src/Makefile.am amanda-2.5.1.oden/amandad-src/Makefile.am
--- amanda-2.5.1/amandad-src/Makefile.am	2006-07-05 15:35:28.000000000 +0200
+++ amanda-2.5.1.oden/amandad-src/Makefile.am	2008-09-29 14:06:04.000000000 +0200
@@ -18,6 +18,8 @@
 libamandad_la_SOURCES= amandad_util.c
 libamandad_la_LDFLAGS = -release $(VERSION)
 
+libamandad_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
+
 noinst_HEADERS  = amandad.h
 
 ###
diff -Naur amanda-2.5.1/client-src/Makefile.am amanda-2.5.1.oden/client-src/Makefile.am
--- amanda-2.5.1/client-src/Makefile.am	2006-07-05 15:35:28.000000000 +0200
+++ amanda-2.5.1.oden/client-src/Makefile.am	2008-09-29 14:06:04.000000000 +0200
@@ -30,6 +30,8 @@
 
 libamclient_la_LDFLAGS = -release $(VERSION)
 
+libamclient_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
+
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
diff -Naur amanda-2.5.1/server-src/Makefile.am amanda-2.5.1.oden/server-src/Makefile.am
--- amanda-2.5.1/server-src/Makefile.am	2006-06-07 12:48:30.000000000 +0200
+++ amanda-2.5.1.oden/server-src/Makefile.am	2008-09-29 14:06:04.000000000 +0200
@@ -58,6 +58,9 @@
 	../tape-src/libamtape.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 
+libamserver_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) \
+	../tape-src/libamtape.$(LIB_EXTENSION)
+
 SUFFIXES =		.sh .pl
 
 .pl:
diff -Naur amanda-2.5.1/tape-src/Makefile.am amanda-2.5.1.oden/tape-src/Makefile.am
--- amanda-2.5.1/tape-src/Makefile.am	2006-05-29 15:39:00.000000000 +0200
+++ amanda-2.5.1.oden/tape-src/Makefile.am	2008-09-29 14:06:04.000000000 +0200
@@ -19,6 +19,8 @@
 
 libamtape_la_LDFLAGS =  -release $(VERSION)
 
+libamtape_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
+
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we