$NetBSD: patch-af,v 1.7 2008/02/15 16:23:09 gdt Exp $ Remove build-directory library dependencies and link against the ones installed by amanda-common instead. --- tape-src/Makefile.in.orig 2007-06-06 19:22:53.000000000 -0400 +++ tape-src/Makefile.in @@ -108,26 +108,18 @@ PROGRAMS = $(sbin_PROGRAMS) amdd_SOURCES = amdd.c amdd_OBJECTS = amdd.$(OBJEXT) amdd_LDADD = $(LDADD) -amdd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +amdd_DEPENDENCIES = libamtape.$(LIB_EXTENSION) ammt_SOURCES = ammt.c ammt_OBJECTS = ammt.$(OBJEXT) ammt_LDADD = $(LDADD) -ammt_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +ammt_DEPENDENCIES = libamtape.$(LIB_EXTENSION) am_amtapeio_OBJECTS = amtapeio.test.$(OBJEXT) amtapeio_OBJECTS = $(am_amtapeio_OBJECTS) -amtapeio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +amtapeio_DEPENDENCIES = libamtape.$(LIB_EXTENSION) am_amtapetype_OBJECTS = tapetype.$(OBJEXT) amtapetype_OBJECTS = $(am_amtapetype_OBJECTS) amtapetype_LDADD = $(LDADD) -amtapetype_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +amtapetype_DEPENDENCIES = libamtape.$(LIB_EXTENSION) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -416,9 +408,7 @@ libamtape_la_LDFLAGS = -release $(VERSIO # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### -LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +LDADD = libamtape.$(LIB_EXTENSION) -lamanda # used for testing only @@ -433,9 +423,7 @@ noinst_HEADERS = \ tapeio.h amtapeio_SOURCES = amtapeio.test.c -amtapeio_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +amtapeio_LDADD = libamtape.$(LIB_EXTENSION) -lamanda all: all-am