$NetBSD: patch-aj,v 1.4 2008/02/15 16:23:09 gdt Exp $

Remove build-directory library dependencies and link against the ones
installed by amanda-common instead.

--- restore-src/Makefile.in.orig	2007-06-06 19:22:53.000000000 -0400
+++ restore-src/Makefile.in
@@ -99,8 +99,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
 	"$(DESTDIR)$(sbindir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-librestore_la_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	../tape-src/libamtape.$(LIB_EXTENSION) \
+librestore_la_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \
 	../server-src/libamserver.$(LIB_EXTENSION)
 am_librestore_la_OBJECTS = restore.lo
 librestore_la_OBJECTS = $(am_librestore_la_OBJECTS)
@@ -112,21 +111,17 @@ amfetchdump_OBJECTS = $(am_amfetchdump_O
 amfetchdump_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 amfetchdump_DEPENDENCIES = librestore.$(LIB_EXTENSION) \
-	../common-src/libamanda.$(LIB_EXTENSION) \
 	../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1)
 am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT)
 amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS)
 am__DEPENDENCIES_2 = librestore.$(LIB_EXTENSION) \
-	../common-src/libamanda.$(LIB_EXTENSION) \
 	../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1)
 amidxtaped_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	../gnulib/libgnu.$(LIB_EXTENSION) \
-	../amandad-src/libamandad.$(LIB_EXTENSION)
+	../gnulib/libgnu.$(LIB_EXTENSION)
 amrestore_SOURCES = amrestore.c
 amrestore_OBJECTS = amrestore.$(OBJEXT)
 amrestore_LDADD = $(LDADD)
 amrestore_DEPENDENCIES = librestore.$(LIB_EXTENSION) \
-	../common-src/libamanda.$(LIB_EXTENSION) \
 	../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -413,21 +408,20 @@ LIB_EXTENSION = la
 # routines, and second to pick up any references in the other libraries.
 ###
 LDADD = librestore.$(LIB_EXTENSION)              \
-      ../common-src/libamanda.$(LIB_EXTENSION) \
       ../gnulib/libgnu.$(LIB_EXTENSION) \
+      -lamanda \
       $(READLINE_LIBS)
 
 amidxtaped_LDADD = $(LDADD) \
-		   ../gnulib/libgnu.$(LIB_EXTENSION) \
-		   ../amandad-src/libamandad.$(LIB_EXTENSION)
+		   -lamandad
 
 amidxtaped_SOURCES = amidxtaped.c
 amfetchdump_SOURCES = amfetchdump.c
 librestore_la_SOURCES = restore.c
 librestore_la_LDFLAGS = -release $(VERSION)
-librestore_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-                   ../tape-src/libamtape.$(LIB_EXTENSION) \
-                  ../server-src/libamserver.$(LIB_EXTENSION)
+librestore_la_LIBADD = ../tape-src/libamtape.$(LIB_EXTENSION) \
+                  ../server-src/libamserver.$(LIB_EXTENSION) \
+                  -lamanda
 
 noinst_HEADERS = restore.h
 all: all-am