Imported Upstream version 2.5.1p3
[debian/amanda] / common-src / Makefile.in
index a562d6e0ef75186a27c456160283e9e2cc5f7228..ac25aee6ba0c68da4048a08bc2024e9cbecc0cab 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +17,6 @@
 # Makefile for Amanda library.
 
 
-SOURCES = $(libamanda_la_SOURCES) $(amfeatures_SOURCES) $(file_SOURCES) $(genversion_SOURCES) $(security_SOURCES) $(statfs_SOURCES) $(token_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -39,13 +37,15 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 EXTRA_PROGRAMS = genversion$(EXEEXT) $(am__EXEEXT_1)
 subdir = common-src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/versuff.c.in alloca.c getcwd.c \
        memmove.c mktime.c snprintf.c strcasecmp.c strerror.c \
-       strftime.c strncasecmp.c strstr.c waitpid.c
+       strftime.c strncasecmp.c strstr.c waitpid.c writev.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/configure.in
@@ -54,35 +54,46 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES = versuff.c
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libamanda_la_DEPENDENCIES = @LTLIBOBJS@ @LTALLOCA@
-am_libamanda_la_OBJECTS = alloc.lo amflock.lo clock.lo debug.lo \
-       dgram.lo error.lo file.lo fileheader.lo amfeatures.lo match.lo \
-       protocol.lo regcomp.lo regerror.lo regexec.lo regfree.lo \
-       security.lo statfs.lo stream.lo token.lo util.lo versuff.lo \
-       version.lo pipespawn.lo sl.lo
+am_libamanda_la_OBJECTS = alloc.lo amfeatures.lo amflock.lo \
+       bsd-security.lo bsdtcp-security.lo bsdudp-security.lo clock.lo \
+       debug.lo dgram.lo error.lo event.lo file.lo fileheader.lo \
+       krb4-security.lo krb5-security.lo match.lo packet.lo \
+       pipespawn.lo protocol.lo regcomp.lo regerror.lo regexec.lo \
+       regfree.lo rsh-security.lo security.lo security-util.lo sl.lo \
+       ssh-security.lo statfs.lo stream.lo tapelist.lo token.lo \
+       util.lo version.lo versuff.lo
 libamanda_la_OBJECTS = $(am_libamanda_la_OBJECTS)
 am__EXEEXT_1 = statfs$(EXEEXT) token$(EXEEXT) file$(EXEEXT) \
-       security$(EXEEXT) amfeatures$(EXEEXT)
+       bsdsecurity$(EXEEXT) amfeatures$(EXEEXT)
 am_amfeatures_OBJECTS = amfeatures.test.$(OBJEXT)
 amfeatures_OBJECTS = $(am_amfeatures_OBJECTS)
 am__DEPENDENCIES_1 = @LTLIBOBJS@ @LTALLOCA@
 am__DEPENDENCIES_2 = alloc.$(OBJEXT) clock.$(OBJEXT) debug.$(OBJEXT) \
-       error.$(OBJEXT) util.$(OBJEXT)
+       error.$(OBJEXT) util.$(OBJEXT) match.$(OBJEXT)
 am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) file.$(OBJEXT)
 amfeatures_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
+am_bsdsecurity_OBJECTS = bsd-security.test.$(OBJEXT)
+bsdsecurity_OBJECTS = $(am_bsdsecurity_OBJECTS)
+bsdsecurity_DEPENDENCIES = alloc.$(OBJEXT) clock.$(OBJEXT) \
+       debug.$(OBJEXT) dgram.$(OBJEXT) error.$(OBJEXT) \
+       event.$(OBJEXT) file.$(OBJEXT) packet.$(OBJEXT) \
+       security.$(OBJEXT) ssh-security.$(OBJEXT) versuff.$(OBJEXT)
 am_file_OBJECTS = file.test.$(OBJEXT)
 file_OBJECTS = $(am_file_OBJECTS)
 file_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am_genversion_OBJECTS = genversion.$(OBJEXT)
 genversion_OBJECTS = $(am_genversion_OBJECTS)
-genversion_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
-       versuff.o
-am_security_OBJECTS = security.test.$(OBJEXT)
-security_OBJECTS = $(am_security_OBJECTS)
-security_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
+genversion_DEPENDENCIES = $(am__DEPENDENCIES_1) versuff.lo
 am_statfs_OBJECTS = statfs.test.$(OBJEXT)
 statfs_OBJECTS = $(am_statfs_OBJECTS)
 statfs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
@@ -92,42 +103,19 @@ token_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/alloca.Plo $(DEPDIR)/getcwd.Plo \
-@AMDEP_TRUE@   $(DEPDIR)/memmove.Plo $(DEPDIR)/mktime.Plo \
-@AMDEP_TRUE@   $(DEPDIR)/snprintf.Plo $(DEPDIR)/strcasecmp.Plo \
-@AMDEP_TRUE@   $(DEPDIR)/strerror.Plo $(DEPDIR)/strftime.Plo \
-@AMDEP_TRUE@   $(DEPDIR)/strncasecmp.Plo $(DEPDIR)/strstr.Plo \
-@AMDEP_TRUE@   $(DEPDIR)/waitpid.Plo ./$(DEPDIR)/alloc.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/amfeatures.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/amfeatures.test.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/amflock.Plo ./$(DEPDIR)/clock.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/debug.Plo ./$(DEPDIR)/dgram.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/error.Plo ./$(DEPDIR)/file.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/file.test.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/fileheader.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/genversion.Po ./$(DEPDIR)/match.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/pipespawn.Plo ./$(DEPDIR)/protocol.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/regcomp.Plo ./$(DEPDIR)/regerror.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/regexec.Plo ./$(DEPDIR)/regfree.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/security.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/security.test.Po ./$(DEPDIR)/sl.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/statfs.Plo ./$(DEPDIR)/statfs.test.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/stream.Plo ./$(DEPDIR)/token.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/token.test.Po ./$(DEPDIR)/util.Plo \
-@AMDEP_TRUE@   ./$(DEPDIR)/version.Plo ./$(DEPDIR)/versuff.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
        $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libamanda_la_SOURCES) $(amfeatures_SOURCES) \
-       $(file_SOURCES) $(genversion_SOURCES) $(security_SOURCES) \
+       $(bsdsecurity_SOURCES) $(file_SOURCES) $(genversion_SOURCES) \
        $(statfs_SOURCES) $(token_SOURCES)
 DIST_SOURCES = $(libamanda_la_SOURCES) $(amfeatures_SOURCES) \
-       $(file_SOURCES) $(genversion_SOURCES) $(security_SOURCES) \
+       $(bsdsecurity_SOURCES) $(file_SOURCES) $(genversion_SOURCES) \
        $(statfs_SOURCES) $(token_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -140,11 +128,14 @@ AMANDA_DEBUG_DAYS = @AMANDA_DEBUG_DAYS@
 AMANDA_TMPDIR = @AMANDA_TMPDIR@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AMLINT = @AMLINT@
+AMLINTFLAGS = @AMLINTFLAGS@
 AMPLOT_CAT_COMPRESS = @AMPLOT_CAT_COMPRESS@
 AMPLOT_CAT_GZIP = @AMPLOT_CAT_GZIP@
 AMPLOT_CAT_PACK = @AMPLOT_CAT_PACK@
 AMPLOT_COMPRESS = @AMPLOT_COMPRESS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -152,6 +143,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 AWK_VAR_ASSIGNMENT_OPT = @AWK_VAR_ASSIGNMENT_OPT@
 BINARY_OWNER = @BINARY_OWNER@
+BUILD_MAN_PAGES_FALSE = @BUILD_MAN_PAGES_FALSE@
+BUILD_MAN_PAGES_TRUE = @BUILD_MAN_PAGES_TRUE@
 CAT = @CAT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -180,7 +173,9 @@ DEFAULT_TAPE_DEVICE = @DEFAULT_TAPE_DEVICE@
 DEFAULT_TAPE_SERVER = @DEFAULT_TAPE_SERVER@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOC_BUILD_DATE = @DOC_BUILD_DATE@
 DUMP = @DUMP@
+DUMPER_DIR = @DUMPER_DIR@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -192,9 +187,12 @@ FFLAGS = @FFLAGS@
 GETCONF = @GETCONF@
 GNUPLOT = @GNUPLOT@
 GNUTAR = @GNUTAR@
+GNUTAR_LISTED_INCREMENTAL_DIR = @GNUTAR_LISTED_INCREMENTAL_DIR@
 GNUTAR_LISTED_INCREMENTAL_DIRX = @GNUTAR_LISTED_INCREMENTAL_DIRX@
 GREP = @GREP@
 GZIP = @GZIP@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -207,6 +205,8 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LL_FMT = @LL_FMT@
+LL_RFMT = @LL_RFMT@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBOBJS = @LTLIBOBJS@
@@ -237,6 +237,7 @@ SETUID_GROUP = @SETUID_GROUP@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SNAPSHOT_STAMP = @SNAPSHOT_STAMP@
+SORT = @SORT@
 STRIP = @STRIP@
 USE_VERSION_SUFFIXES = @USE_VERSION_SUFFIXES@
 VDUMP = @VDUMP@
@@ -269,10 +270,13 @@ WANT_SERVER_FALSE = @WANT_SERVER_FALSE@
 WANT_SERVER_TRUE = @WANT_SERVER_TRUE@
 WANT_SETUID_CLIENT_FALSE = @WANT_SETUID_CLIENT_FALSE@
 WANT_SETUID_CLIENT_TRUE = @WANT_SETUID_CLIENT_TRUE@
+WANT_SSH_SECURITY_FALSE = @WANT_SSH_SECURITY_FALSE@
+WANT_SSH_SECURITY_TRUE = @WANT_SSH_SECURITY_TRUE@
 WANT_TAPE_FALSE = @WANT_TAPE_FALSE@
 WANT_TAPE_TRUE = @WANT_TAPE_TRUE@
 XFSDUMP = @XFSDUMP@
 XFSRESTORE = @XFSRESTORE@
+XSLTPROC = @XSLTPROC@
 YACC = @YACC@
 ac_c = @ac_c@
 ac_ct_AR = @ac_ct_AR@
@@ -289,6 +293,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -325,61 +331,119 @@ lib_LTLIBRARIES = libamanda.la
 REGDIR = ../regex-src
 REGsrcdir = $(srcdir)/$(REGDIR)
 INCLUDES = -I$(REGsrcdir)
+LINT = @AMLINT@
+LINTFLAGS = @AMLINTFLAGS@
 libamanda_la_SOURCES = \
-       alloc.c         amflock.c       clock.c         debug.c         \
-       dgram.c         error.c         file.c          fileheader.c    \
-       amfeatures.c    match.c                                         \
-       protocol.c      regcomp.c       regerror.c      regexec.c       \
-       regfree.c       security.c      statfs.c        stream.c        \
-       token.c         util.c          versuff.c       version.c       \
-        pipespawn.c    sl.c
+       alloc.c                 \
+       amfeatures.c            \
+       amflock.c               \
+       bsd-security.c          \
+       bsdtcp-security.c       \
+       bsdudp-security.c       \
+       clock.c                 \
+       debug.c                 \
+       dgram.c                 \
+       error.c                 \
+       event.c                 \
+       file.c                  \
+       fileheader.c            \
+       krb4-security.c         \
+       krb5-security.c         \
+       match.c                 \
+       packet.c                \
+       pipespawn.c             \
+       protocol.c              \
+       regcomp.c               \
+       regerror.c              \
+       regexec.c               \
+       regfree.c               \
+       rsh-security.c          \
+       security.c              \
+       security-util.c         \
+       sl.c                    \
+       ssh-security.c          \
+       statfs.c                \
+       stream.c                \
+       tapelist.c              \
+       token.c                 \
+       util.c                  \
+       version.c               \
+       versuff.c
 
 libamanda_la_LIBADD = @LTLIBOBJS@ @LTALLOCA@
 libamanda_la_LDFLAGS = -release $(VERSION)
-noinst_HEADERS = amanda.h      arglist.h       \
-                       clock.h         dgram.h         \
-                       amfeatures.h    protocol.h      \
-                       statfs.h        stream.h        \
-                       token.h         version.h       \
-                       amregex.h       fileheader.h    \
-                       util.h          pipespawn.h     \
-                       sl.h
+noinst_HEADERS = \
+       amanda.h                \
+       amfeatures.h            \
+       amregex.h               \
+       arglist.h               \
+       clock.h                 \
+       dgram.h                 \
+       event.h                 \
+       fileheader.h            \
+       packet.h                \
+       pipespawn.h             \
+       protocol.h              \
+       queue.h                 \
+       security.h              \
+       security-util.h         \
+       sl.h                    \
+       statfs.h                \
+       stream.h                \
+       tapelist.h              \
+       token.h                 \
+       util.h                  \
+       version.h
+
+genversion_SOURCES = genversion.c
+genversion_LDADD = $(libamanda_la_LIBADD) versuff.lo
+REGEXCSRC = $(REGsrcdir)/regcomp.c     \
+               $(REGsrcdir)/regexec.c  \
+               $(REGsrcdir)/regerror.c \
+               $(REGsrcdir)/regfree.c
+
+REGEXHSRC = $(REGsrcdir)/regex2.h      \
+               $(REGEXCSRC)
 
+
+# these are used for testing only:
+TEST_PROGS = statfs token file bsdsecurity amfeatures
+CLEANFILES = regex.h regcomp.ih engine.ih regerror.ih *.test.c
+DISTCLEANFILES = version.c genversion.h genversion amanda-int.h
+
+# used for testing only
 STANDARD_COMMON_STUFF_NOT_FILE = \
        alloc.$(OBJEXT) \
        clock.$(OBJEXT) \
        debug.$(OBJEXT) \
        error.$(OBJEXT) \
-       util.$(OBJEXT)
+       util.$(OBJEXT) \
+       match.$(OBJEXT)
 
 STANDARD_COMMON_STUFF = \
        $(STANDARD_COMMON_STUFF_NOT_FILE) \
        file.$(OBJEXT)
 
-EXTRA_DIST = krb4-security.c   krb4-security.h
-genversion_SOURCES = genversion.c
-genversion_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF) versuff.o
-REGEXHSRC = $(REGsrcdir)/regex2.h \
-               $(REGsrcdir)/regcomp.c \
-               $(REGsrcdir)/regexec.c \
-               $(REGsrcdir)/regerror.c \
-               $(REGsrcdir)/regfree.c
-
-
-# these are used for testing only:
-TEST_PROGS = statfs token file security amfeatures
-CLEANFILES = regex.h regcomp.ih engine.ih regerror.ih *.test.c
-DISTCLEANFILES = version.c
-
-# used for testing only
 statfs_SOURCES = statfs.test.c
 statfs_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
 token_SOURCES = token.test.c
 token_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
 file_SOURCES = file.test.c
 file_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF_NOT_FILE)
-security_SOURCES = security.test.c
-security_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
+bsdsecurity_SOURCES = bsd-security.test.c
+bsdsecurity_LDADD = $(libamanda_a_LIBADD) \
+                   alloc.$(OBJEXT) \
+                   clock.$(OBJEXT) \
+                   debug.$(OBJEXT) \
+                   dgram.$(OBJEXT) \
+                   error.$(OBJEXT) \
+                   event.$(OBJEXT) \
+                   file.$(OBJEXT) \
+                   packet.$(OBJEXT) \
+                   security.$(OBJEXT) \
+                   ssh-security.$(OBJEXT) \
+                   versuff.$(OBJEXT)
+
 amfeatures_SOURCES = amfeatures.test.c
 amfeatures_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
 all: all-am
@@ -422,7 +486,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           f="`echo $$p | sed -e 's|^.*/||'`"; \
+           f=$(am__strip_dir) \
            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
          else :; fi; \
@@ -430,8 +494,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 
 uninstall-libLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-           p="`echo $$p | sed -e 's|^.*/||'`"; \
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
        done
@@ -440,7 +504,7 @@ clean-libLTLIBRARIES:
        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" = "$$p" && dir=.; \
+         test "$$dir" != "$$p" || dir=.; \
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
@@ -449,15 +513,15 @@ libamanda.la: $(libamanda_la_OBJECTS) $(libamanda_la_DEPENDENCIES)
 amfeatures$(EXEEXT): $(amfeatures_OBJECTS) $(amfeatures_DEPENDENCIES) 
        @rm -f amfeatures$(EXEEXT)
        $(LINK) $(amfeatures_LDFLAGS) $(amfeatures_OBJECTS) $(amfeatures_LDADD) $(LIBS)
+bsdsecurity$(EXEEXT): $(bsdsecurity_OBJECTS) $(bsdsecurity_DEPENDENCIES) 
+       @rm -f bsdsecurity$(EXEEXT)
+       $(LINK) $(bsdsecurity_LDFLAGS) $(bsdsecurity_OBJECTS) $(bsdsecurity_LDADD) $(LIBS)
 file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 
        @rm -f file$(EXEEXT)
        $(LINK) $(file_LDFLAGS) $(file_OBJECTS) $(file_LDADD) $(LIBS)
 genversion$(EXEEXT): $(genversion_OBJECTS) $(genversion_DEPENDENCIES) 
        @rm -f genversion$(EXEEXT)
        $(LINK) $(genversion_LDFLAGS) $(genversion_OBJECTS) $(genversion_LDADD) $(LIBS)
-security$(EXEEXT): $(security_OBJECTS) $(security_DEPENDENCIES) 
-       @rm -f security$(EXEEXT)
-       $(LINK) $(security_LDFLAGS) $(security_OBJECTS) $(security_LDADD) $(LIBS)
 statfs$(EXEEXT): $(statfs_OBJECTS) $(statfs_DEPENDENCIES) 
        @rm -f statfs$(EXEEXT)
        $(LINK) $(statfs_LDFLAGS) $(statfs_OBJECTS) $(statfs_LDADD) $(LIBS)
@@ -482,31 +546,43 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/waitpid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/writev.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amfeatures.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amfeatures.test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amflock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd-security.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd-security.test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsdtcp-security.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsdudp-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clock.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dgram.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileheader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genversion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb4-security.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/match.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipespawn.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regerror.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regfree.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsh-security.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/security-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/security.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/security.test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssh-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statfs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statfs.test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tapelist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/token.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/token.test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@
@@ -517,24 +593,21 @@ distclean-compile:
 @am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -568,7 +641,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-         test -z "$$unique" && unique=$$empty_fix; \
+         test -n "$$unique" || unique=$$empty_fix; \
          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
            $$tags $$unique; \
        fi
@@ -649,7 +722,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f $(CONFIG_CLEAN_FILES)
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -724,7 +797,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
        cat $< > $@
        chmod a+x $@
 
-genversion.o: genversion.h
+genversion.@OBJEXT@: genversion.h
 genversion.h: $(top_builddir)/config.status
        -rm -f $@ $@.new
        echo '#define CC "$(CC)"' > $@.new
@@ -743,16 +816,28 @@ regerror.@OBJEXT@ regerror.lo: regex.h regerror.ih
 regfree.@OBJEXT@ regfree.lo: regex.h
 
 regex.h: $(REGEXHSRC) $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -i _REGEX_H_ $(REGEXHSRC) >$@
+       sh $(REGsrcdir)/mkh -i _REGEX_H_ $(REGEXHSRC) >$@
 
 regcomp.ih: $(REGsrcdir)/regcomp.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regcomp.c >$@
+       sh $(REGsrcdir)/mkh -p $(REGsrcdir)/regcomp.c >$@
 
 engine.ih: $(REGsrcdir)/engine.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/engine.c >$@
+       sh $(REGsrcdir)/mkh -p $(REGsrcdir)/engine.c >$@
 
 regerror.ih: $(REGsrcdir)/regerror.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regerror.c >$@
+       sh $(REGsrcdir)/mkh -p $(REGsrcdir)/regerror.c >$@
+
+lint:
+       @echo $(LINT) $(libamanda_la_SOURCES)
+       @$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config $(INCLUDES) $(libamanda_la_SOURCES)
+       @echo $(LINT) $(genversion_SOURCES)
+       @$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config $(INCLUDES) $(genversion_SOURCES)
+
+listlibsrc:
+       @ for p in $(libamanda_la_SOURCES) $(REGEXCSRC); do     \
+               listlibsrcs="$$listlibsrcs `pwd`/$$p";          \
+       done;                                                   \
+       echo $$listlibsrcs >listlibsrc.output
 
 %.test.c: $(srcdir)/%.c
        echo '#define TEST' >$@