--- client-src/Makefile.am.orig	2006-03-29 01:44:37 +0400

+++ client-src/Makefile.am	2006-03-29 19:14:43 +0400

@@ -26,6 +26,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

--- server-src/Makefile.am.orig	2006-03-29 01:44:37 +0400

+++ server-src/Makefile.am	2006-03-29 19:13:03 +0400

@@ -30,6 +30,8 @@

 libamserver_la_LDFLAGS= -release $(VERSION)

+libamserver_la_LIBADD = ../tape-src/libamtape.$(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

--- tape-src/Makefile.am.orig	2006-03-29 19:19:46 +0400

+++ tape-src/Makefile.am	2006-03-29 19:09:43 +0400

@@ -16,6 +16,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

--- client-src/Makefile.in.orig	2006-03-29 19:13:21 +0400

+++ client-src/Makefile.in	2006-03-29 19:14:55 +0400

@@ -1,6 +1,7 @@

 libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES)

-libamclient_la_LIBADD =

+libamclient_la_DEPENDENCIES =  \

+	../common-src/libamanda.$(LIB_EXTENSION)

 am__libamclient_la_SOURCES_DIST = amandates.c getfsent.c unctime.c \

 	client_util.c findpass.c

 @WANT_SAMBA_TRUE@am__objects_1 = findpass.lo

@@ -387,6 +392,7 @@

 			$(samba_sources)

 libamclient_la_LDFLAGS = -release $(VERSION)

+libamclient_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)

 ###

 # Because libamanda includes routines (e.g. regex) provided by some system

--- server-src/Makefile.in.orig	2006-03-29 19:09:51 +0400

+++ server-src/Makefile.in	2006-03-29 19:14:55 +0400

@@ -1,6 +1,6 @@

 libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES)

-libamserver_la_LIBADD =

+libamserver_la_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION)

 am_libamserver_la_OBJECTS = amindex.lo changer.lo conffile.lo \

 	diskfile.lo driverio.lo holding.lo infofile.lo logfile.lo \

 	tapefile.lo find.lo server_util.lo taperscan.lo

@@ -518,6 +530,7 @@

                         taperscan.c

 libamserver_la_LDFLAGS = -release $(VERSION)

+libamserver_la_LIBADD = ../tape-src/libamtape.$(LIB_EXTENSION)

 ###

 # Because libamanda includes routines (e.g. regex) provided by some system

--- tape-src/Makefile.in.orig	2006-03-29 19:19:46 +0400

+++ tape-src/Makefile.in	2006-03-29 19:09:51 +0400

@@ -1,7 +1,7 @@

 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"

 libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES)

-libamtape_la_LIBADD =

+libamtape_la_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)

 am_libamtape_la_OBJECTS = output-file.lo output-null.lo output-rait.lo \

 	output-tape.lo tapeio.lo

 libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)

@@ -325,6 +324,7 @@

 			tapeio.c

 libamtape_la_LDFLAGS = -release $(VERSION)

+libamtape_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)

 ###

 # Because libamanda includes routines (e.g. regex) provided by some system