$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $ Remove build-directory library dependencies and link against the ones installed by amanda-common instead. --- client-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 +++ client-src/Makefile.in @@ -115,83 +115,53 @@ PROGRAMS = $(libexec_PROGRAMS) calcsize_SOURCES = calcsize.c calcsize_OBJECTS = calcsize.$(OBJEXT) calcsize_LDADD = $(LDADD) -calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) am_getfsent_OBJECTS = getfsent.test.$(OBJEXT) getfsent_OBJECTS = $(am_getfsent_OBJECTS) getfsent_LDADD = $(LDADD) -getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) killpgrp_SOURCES = killpgrp.c killpgrp_OBJECTS = killpgrp.$(OBJEXT) killpgrp_LDADD = $(LDADD) -killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) noop_SOURCES = noop.c noop_OBJECTS = noop.$(OBJEXT) noop_LDADD = $(LDADD) -noop_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +noop_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) rundump_SOURCES = rundump.c rundump_OBJECTS = rundump.$(OBJEXT) rundump_LDADD = $(LDADD) -rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) runtar_SOURCES = runtar.c runtar_OBJECTS = runtar.$(OBJEXT) runtar_LDADD = $(LDADD) -runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) selfcheck_SOURCES = selfcheck.c selfcheck_OBJECTS = selfcheck.$(OBJEXT) selfcheck_LDADD = $(LDADD) -selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \ sendbackup-gnutar.$(OBJEXT) sendbackup_OBJECTS = $(am_sendbackup_OBJECTS) sendbackup_LDADD = $(LDADD) -sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) sendsize_SOURCES = sendsize.c sendsize_OBJECTS = sendsize.$(OBJEXT) sendsize_LDADD = $(LDADD) -sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) versionsuffix_SOURCES = versionsuffix.c versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) versionsuffix_LDADD = $(LDADD) -versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ +versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ ../gnulib/libgnu.$(LIB_EXTENSION) libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) @@ -489,11 +459,10 @@ libamclient_la_LDFLAGS = -release $(VERS # 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) \ - libamclient.$(LIB_EXTENSION) \ - ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) +LDADD = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) \ + -lamanda \ + -lamandad SUFFIXES = .sh .pl