X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2FMakefile.in;h=7707954392de6793a93070eddb1c9821b3ca9871;hb=d8d159e0a641a6478991e09f7cac064f6e703abe;hp=0651b1af17eb2aa7c1a61405c75a8275eb821de1;hpb=e442edb4d5816c4ad107ad9e71164f845eba70ad;p=debian%2Famanda diff --git a/server-src/Makefile.in b/server-src/Makefile.in index 0651b1a..7707954 100644 --- a/server-src/Makefile.in +++ b/server-src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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,7 +17,7 @@ # Makefile for Amanda server programs. # vim:ft=automake -# Copyright (c) 2005 Zmanda, Inc. All Rights Reserved. +# Copyright (c) 2005-2008 Zmanda Inc. All Rights Reserved. # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License version 2.1 as @@ -32,14 +32,14 @@ # along with this library; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # -# Contact information: Zmanda Inc., 505 N Mathlida Ave, Suite 120 -# Sunnyvale, CA 94085, USA, or: http://www.zmanda.com +# Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300 +# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com # simple include file to pre-define variables which are then +='d by other # scripts in this directory. # vim:ft=automake -# Copyright (c) 2005 Zmanda, Inc. All Rights Reserved. +# Copyright (c) 2005-2008 Zmanda Inc. All Rights Reserved. # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License version 2.1 as @@ -54,8 +54,8 @@ # along with this library; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # -# Contact information: Zmanda Inc., 505 N Mathlida Ave, Suite 120 -# Sunnyvale, CA 94085, USA, or: http://www.zmanda.com +# Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300 +# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com # SYNOPSIS: # @@ -66,7 +66,11 @@ # Files which support it are syntax-checked when the user invokes 'make check'. # # All *target* filenames must be listed in SCRIPTS_SHELL, SCRIPTS_PERL, and -# SCRIPTS_AWK to support 'make check', 'make dist', and 'make distclean'. +# SCRIPTS_AWK to support 'make check', 'make dist', and 'make distclean'. No +# files which are not substituted by config.status should be included in +# SCRIPTS_PERL, SCRIPTS_SHELL, or SCRIPTS_AWK. If non-generated files are listed +# for installation, then Automake will figure out that they should be distributed; +# otherwise, include them in EXTRA_DIST. # # USAGE: # @@ -76,12 +80,15 @@ # SCRIPTS_PERL = fooscript barscript perl-lib.pl perlmod.pm # SCRIPTS_SHELL = shell1 shell2 sh-lib.sh # SCRIPTS_AWK = talk balk chalk awk-lib.awk +# sbin_SCRIPTS = not-subbed +# EXTRA_DIST = util-script.pl # # with the corresponding files in the repository: # # fooscript.pl barscript.pl perl-lib.pl.in perlmod.pm.in # shell1.sh shell2.sh sh-lib.sh.in # talk.awk balk.awk chalk.awk awk-lib.awk.in +# not-subbed util-script.pl # # by default, all shell and perl scripts are syntax checked. If this is # a problem (for example, perl scripts depending on Amanda extension @@ -125,7 +132,7 @@ # INSTALLPERMS_exec = \ # dest=$(sbindir) chown=amanda chmod= \ # foo bar \ -# chmod=u+s,o-rwx \ +# chmod=07450 \ # bing # dest=$(libexecdir) chmod= \ # $(libexec_PROGRAMS) @@ -135,7 +142,15 @@ # # This whole operation is not required when making builds for packaging, # and can be disabled with --disable-installperms, via the WANT_INSTALLPERMS -# AM_CONDITIONAL. +# AM_CONDITIONAL. When disabled, the file 'installperms.sh' in the top-level +# build directory is populated with a format suitable for shell interpretation, +# with lines like this: +# installperm "amanda:disk" "04750" "/usr/local/sbin/bing" +# the arguments being, respectively, owner:group, mode, and filename. There will +# be exactly one line for each file which has specific permissions. The intention +# is that this file be used by packaging scripts to set correct permissions at install +# time. Note that files which have no special permissions requirements do not appear +# in this file at all, due to limitations of Automake. # vim:ft=automake @@ -167,8 +182,9 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(top_srcdir)/config/automake/precompile.am \ $(top_srcdir)/config/automake/scripts.am \ $(top_srcdir)/config/automake/vars.am +@WANT_INSTALLPERMS_FALSE@am__append_1 = $(installperms_sh) sbin_PROGRAMS = amadmin$(EXEEXT) amcheck$(EXEEXT) amflush$(EXEEXT) \ - amgetconf$(EXEEXT) amlabel$(EXEEXT) amtape$(EXEEXT) \ + amlabel$(EXEEXT) amservice$(EXEEXT) amtape$(EXEEXT) \ amreport$(EXEEXT) noinst_PROGRAMS = taper_source_test$(EXEEXT) amlibexec_PROGRAMS = amindexd$(EXEEXT) amlogroll$(EXEEXT) \ @@ -180,6 +196,7 @@ subdir = server-src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = \ $(top_srcdir)/config/macro-archive/ac_define_dir.m4 \ + $(top_srcdir)/config/macro-archive/ac_perl_module_version.m4 \ $(top_srcdir)/config/macro-archive/ac_prog_perl_version.m4 \ $(top_srcdir)/config/macro-archive/ac_prog_swig.m4 \ $(top_srcdir)/config/macro-archive/ax_compare_version.m4 \ @@ -213,6 +230,7 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/amanda/libs.m4 \ $(top_srcdir)/config/amanda/net.m4 \ $(top_srcdir)/config/amanda/progs.m4 \ + $(top_srcdir)/config/amanda/ps.m4 \ $(top_srcdir)/config/amanda/readdir.m4 \ $(top_srcdir)/config/amanda/readline.m4 \ $(top_srcdir)/config/amanda/rsh-security.m4 \ @@ -235,7 +253,9 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/gnulib/float_h.m4 \ $(top_srcdir)/config/gnulib/fsusage.m4 \ $(top_srcdir)/config/gnulib/getaddrinfo.m4 \ + $(top_srcdir)/config/gnulib/getopt.m4 \ $(top_srcdir)/config/gnulib/gettimeofday.m4 \ + $(top_srcdir)/config/gnulib/gnulib-common.m4 \ $(top_srcdir)/config/gnulib/gnulib-comp.m4 \ $(top_srcdir)/config/gnulib/include_next.m4 \ $(top_srcdir)/config/gnulib/inet_ntop.m4 \ @@ -263,7 +283,6 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/gnulib/sys_stat_h.m4 \ $(top_srcdir)/config/gnulib/sys_time_h.m4 \ $(top_srcdir)/config/gnulib/tempname.m4 \ - $(top_srcdir)/config/gnulib/ulonglong.m4 \ $(top_srcdir)/config/gnulib/unistd_h.m4 \ $(top_srcdir)/config/gnulib/vasnprintf.m4 \ $(top_srcdir)/config/gnulib/visibility.m4 \ @@ -274,7 +293,6 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/gettext-macros/lib-ld.m4 \ $(top_srcdir)/config/gettext-macros/lib-link.m4 \ $(top_srcdir)/config/gettext-macros/lib-prefix.m4 \ - $(top_srcdir)/config/gettext-macros/longlong.m4 \ $(top_srcdir)/config/gettext-macros/nls.m4 \ $(top_srcdir)/config/gettext-macros/po.m4 \ $(top_srcdir)/config/gettext-macros/progtest.m4 \ @@ -318,38 +336,32 @@ amadmin_LDADD = $(LDADD) am__DEPENDENCIES_1 = amadmin_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amcheck_SOURCES = amcheck.c amcheck_OBJECTS = amcheck.$(OBJEXT) amcheck_LDADD = $(LDADD) amcheck_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amcleanupdisk_SOURCES = amcleanupdisk.c amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT) amcleanupdisk_LDADD = $(LDADD) amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amflush_SOURCES = amflush.c amflush_OBJECTS = amflush.$(OBJEXT) amflush_LDADD = $(LDADD) amflush_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) -am_amgetconf_OBJECTS = getconf.$(OBJEXT) -amgetconf_OBJECTS = $(am_amgetconf_OBJECTS) -amgetconf_LDADD = $(LDADD) -amgetconf_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ - ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am__objects_1 = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ list_dir.$(OBJEXT) am_amindexd_OBJECTS = $(am__objects_1) amindexd_OBJECTS = $(am_amindexd_OBJECTS) am__DEPENDENCIES_2 = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amindexd_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ../amandad-src/libamandad.la amlabel_SOURCES = amlabel.c @@ -357,73 +369,79 @@ amlabel_OBJECTS = amlabel.$(OBJEXT) amlabel_LDADD = $(LDADD) amlabel_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amlogroll_SOURCES = amlogroll.c amlogroll_OBJECTS = amlogroll.$(OBJEXT) amlogroll_LDADD = $(LDADD) amlogroll_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_amreport_OBJECTS = reporter.$(OBJEXT) amreport_OBJECTS = $(am_amreport_OBJECTS) amreport_LDADD = $(LDADD) amreport_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) +amservice_SOURCES = amservice.c +amservice_OBJECTS = amservice.$(OBJEXT) +amservice_LDADD = $(LDADD) +amservice_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ + ../device-src/libamdevice.la ../common-src/libamanda.la \ + $(am__DEPENDENCIES_1) amtape_SOURCES = amtape.c amtape_OBJECTS = amtape.$(OBJEXT) amtape_LDADD = $(LDADD) amtape_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amtrmidx_SOURCES = amtrmidx.c amtrmidx_OBJECTS = amtrmidx.$(OBJEXT) amtrmidx_LDADD = $(LDADD) amtrmidx_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) amtrmlog_SOURCES = amtrmlog.c amtrmlog_OBJECTS = amtrmlog.$(OBJEXT) amtrmlog_LDADD = $(LDADD) amtrmlog_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) chunker_SOURCES = chunker.c chunker_OBJECTS = chunker.$(OBJEXT) chunker_LDADD = $(LDADD) chunker_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_diskfile_OBJECTS = diskfile.test.$(OBJEXT) diskfile_OBJECTS = $(am_diskfile_OBJECTS) diskfile_LDADD = $(LDADD) diskfile_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) driver_SOURCES = driver.c driver_OBJECTS = driver.$(OBJEXT) driver_LDADD = $(LDADD) driver_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) dumper_SOURCES = dumper.c dumper_OBJECTS = dumper.$(OBJEXT) dumper_LDADD = $(LDADD) dumper_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_infofile_OBJECTS = infofile.test.$(OBJEXT) infofile_OBJECTS = $(am_infofile_OBJECTS) infofile_LDADD = $(LDADD) infofile_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) planner_SOURCES = planner.c planner_OBJECTS = planner.$(OBJEXT) planner_LDADD = $(LDADD) planner_DEPENDENCIES = ../common-src/libamanda.la libamserver.la \ ../device-src/libamdevice.la ../common-src/libamanda.la \ - ../gnulib/libgnu.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_taper_OBJECTS = taper.$(OBJEXT) taper-source.$(OBJEXT) \ taper-file-source.$(OBJEXT) taper-port-source.$(OBJEXT) \ taper-disk-port-source.$(OBJEXT) \ @@ -440,7 +458,7 @@ taper_source_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ../amandad-src/libamandad.la sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(sbin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -453,23 +471,23 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libamserver_la_SOURCES) amadmin.c amcheck.c \ - amcleanupdisk.c amflush.c $(amgetconf_SOURCES) \ - $(amindexd_SOURCES) amlabel.c amlogroll.c $(amreport_SOURCES) \ - amtape.c amtrmidx.c amtrmlog.c chunker.c $(diskfile_SOURCES) \ - driver.c dumper.c $(infofile_SOURCES) planner.c \ - $(taper_SOURCES) $(taper_source_test_SOURCES) + amcleanupdisk.c amflush.c $(amindexd_SOURCES) amlabel.c \ + amlogroll.c $(amreport_SOURCES) amservice.c amtape.c \ + amtrmidx.c amtrmlog.c chunker.c $(diskfile_SOURCES) driver.c \ + dumper.c $(infofile_SOURCES) planner.c $(taper_SOURCES) \ + $(taper_source_test_SOURCES) DIST_SOURCES = $(libamserver_la_SOURCES) amadmin.c amcheck.c \ - amcleanupdisk.c amflush.c $(amgetconf_SOURCES) \ - $(amindexd_SOURCES) amlabel.c amlogroll.c $(amreport_SOURCES) \ - amtape.c amtrmidx.c amtrmlog.c chunker.c $(diskfile_SOURCES) \ - driver.c dumper.c $(infofile_SOURCES) planner.c \ - $(taper_SOURCES) $(taper_source_test_SOURCES) + amcleanupdisk.c amflush.c $(amindexd_SOURCES) amlabel.c \ + amlogroll.c $(amreport_SOURCES) amservice.c amtape.c \ + amtrmidx.c amtrmlog.c chunker.c $(diskfile_SOURCES) driver.c \ + dumper.c $(infofile_SOURCES) planner.c $(taper_SOURCES) \ + $(taper_source_test_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_STRING_H = @ABSOLUTE_STRING_H@ ACLOCAL = @ACLOCAL@ +AIX_BACKUP = @AIX_BACKUP@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMANDA_DBGDIR = @AMANDA_DBGDIR@ @@ -484,9 +502,10 @@ AMPLOT_CAT_GZIP = @AMPLOT_CAT_GZIP@ AMPLOT_CAT_PACK = @AMPLOT_CAT_PACK@ AMPLOT_COMPRESS = @AMPLOT_COMPRESS@ AMTAR = @AMTAR@ -AM_CFLAGS = @AM_CFLAGS@ +APPLICATION_DIR = @APPLICATION_DIR@ AR = @AR@ ARPA_INET_H = @ARPA_INET_H@ +ASSERTIONS = @ASSERTIONS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -498,16 +517,28 @@ BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BSDTCP_SECURITY = @BSDTCP_SECURITY@ +BSDUDP_SECURITY = @BSDUDP_SECURITY@ +BSD_SECURITY = @BSD_SECURITY@ CAT = @CAT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ +CHECK_USERID = @CHECK_USERID@ CHIO = @CHIO@ CHS = @CHS@ +CLIENT_HOST_INSTANCE = @CLIENT_HOST_INSTANCE@ +CLIENT_HOST_KEY_FILE = @CLIENT_HOST_KEY_FILE@ +CLIENT_HOST_PRINCIPAL = @CLIENT_HOST_PRINCIPAL@ CLIENT_LOGIN = @CLIENT_LOGIN@ CLIENT_SCRIPTS_OPT = @CLIENT_SCRIPTS_OPT@ COMPRESS = @COMPRESS@ +COMPRESS_BEST_OPT = @COMPRESS_BEST_OPT@ +COMPRESS_FAST_OPT = @COMPRESS_FAST_OPT@ +COMPRESS_PATH = @COMPRESS_PATH@ +COMPRESS_SUFFIX = @COMPRESS_SUFFIX@ +CONFIG_CLOBBER_MY_CONFIG = @CONFIG_CLOBBER_MY_CONFIG@ CONFIG_DIR = @CONFIG_DIR@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -521,6 +552,7 @@ DD = @DD@ DEFAULT_AMANDATES_FILE = @DEFAULT_AMANDATES_FILE@ DEFAULT_CHANGER_DEVICE = @DEFAULT_CHANGER_DEVICE@ DEFAULT_CONFIG = @DEFAULT_CONFIG@ +DEFAULT_MAILER = @DEFAULT_MAILER@ DEFAULT_SERVER = @DEFAULT_SERVER@ DEFAULT_TAPE_DEVICE = @DEFAULT_TAPE_DEVICE@ DEFAULT_TAPE_SERVER = @DEFAULT_TAPE_SERVER@ @@ -528,7 +560,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DOC_BUILD_DATE = @DOC_BUILD_DATE@ DUMP = @DUMP@ -DUMPER_DIR = @DUMPER_DIR@ +DUMP_RETURNS_1 = @DUMP_RETURNS_1@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -541,6 +573,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FLOAT_H = @FLOAT_H@ GETCONF = @GETCONF@ +GETOPT_H = @GETOPT_H@ GETTEXT = @GETTEXT@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ @@ -551,9 +584,12 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_DUP2 = @GNULIB_DUP2@ +GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ GNULIB_FTELL = @GNULIB_FTELL@ @@ -563,6 +599,7 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ @@ -587,8 +624,10 @@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTENV = @GNULIB_PUTENV@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ @@ -597,11 +636,15 @@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ +GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ GNULIB_STRPBRK = @GNULIB_STRPBRK@ GNULIB_STRSEP = @GNULIB_STRSEP@ +GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ +GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ @@ -615,6 +658,7 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GZIP = @GZIP@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -623,9 +667,10 @@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ +HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ +HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -633,7 +678,9 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GZIP = @HAVE_GZIP@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_IO_H = @HAVE_IO_H@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ @@ -642,8 +689,10 @@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_OS_H = @HAVE_OS_H@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ @@ -651,7 +700,6 @@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ HAVE_STRNDUP = @HAVE_STRNDUP@ @@ -660,10 +708,12 @@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ +HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -679,6 +729,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +KRB4_SECURITY = @KRB4_SECURITY@ +KRB5_SECURITY = @KRB5_SECURITY@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -694,9 +746,9 @@ LIBS = @LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LL_FMT = @LL_FMT@ -LL_RFMT = @LL_RFMT@ LN_S = @LN_S@ +LOCKING = @LOCKING@ +LOW_TCPPORTRANGE = @LOW_TCPPORTRANGE@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ @@ -705,7 +757,6 @@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ MAILER = @MAILER@ MAKEINFO = @MAKEINFO@ -MAXTAPEBLOCKSIZE = @MAXTAPEBLOCKSIZE@ MCUTIL = @MCUTIL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ @@ -741,26 +792,37 @@ PERL_INC = @PERL_INC@ PKG_CONFIG = @PKG_CONFIG@ POSUB = @POSUB@ PRINT = @PRINT@ +PS = @PS@ +PS_ARGUMENT = @PS_ARGUMENT@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ +REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ REPLACE_FTELL = @REPLACE_FTELL@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_PRINTF = @REPLACE_PRINTF@ +REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ +REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ @@ -768,7 +830,11 @@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ RESTORE = @RESTORE@ +RSH_SECURITY = @RSH_SECURITY@ SAMBA_CLIENT = @SAMBA_CLIENT@ +SERVER_HOST_INSTANCE = @SERVER_HOST_INSTANCE@ +SERVER_HOST_KEY_FILE = @SERVER_HOST_KEY_FILE@ +SERVER_HOST_PRINCIPAL = @SERVER_HOST_PRINCIPAL@ SERVICE_SUFFIX = @SERVICE_SUFFIX@ SETUID_GROUP = @SETUID_GROUP@ SET_MAKE = @SET_MAKE@ @@ -778,6 +844,7 @@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ SNAPSHOT_STAMP = @SNAPSHOT_STAMP@ SORT = @SORT@ SSH = @SSH@ +SSH_SECURITY = @SSH_SECURITY@ STDBOOL_H = @STDBOOL_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -787,7 +854,14 @@ SWIG_LIB = @SWIG_LIB@ SYS_SOCKET_H = @SYS_SOCKET_H@ SYS_STAT_H = @SYS_STAT_H@ SYS_TIME_H = @SYS_TIME_H@ +TCPPORTRANGE = @TCPPORTRANGE@ +TICKET_LIFETIME = @TICKET_LIFETIME@ +UDPPORTRANGE = @UDPPORTRANGE@ +UNCOMPRESS_OPT = @UNCOMPRESS_OPT@ +UNCOMPRESS_PATH = @UNCOMPRESS_PATH@ +USE_AMANDAHOSTS = @USE_AMANDAHOSTS@ USE_NLS = @USE_NLS@ +USE_RUNDUMP = @USE_RUNDUMP@ USE_VERSION_SUFFIXES = @USE_VERSION_SUFFIXES@ VDUMP = @VDUMP@ VERSION = @VERSION@ @@ -796,6 +870,7 @@ VERSION_MAJOR = @VERSION_MAJOR@ VERSION_MINOR = @VERSION_MINOR@ VERSION_PATCH = @VERSION_PATCH@ VERSION_SUFFIX = @VERSION_SUFFIX@ +VOID_UNSETENV = @VOID_UNSETENV@ VRESTORE = @VRESTORE@ VXDUMP = @VXDUMP@ VXRESTORE = @VXRESTORE@ @@ -824,6 +899,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +amdatadir = @amdatadir@ amincludedir = @amincludedir@ amlibdir = @amlibdir@ amlibexecdir = @amlibexecdir@ @@ -842,6 +918,8 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ +gltests_LIBOBJS = @gltests_LIBOBJS@ +gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -871,6 +949,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = @@ -882,7 +961,8 @@ MOSTLYCLEANFILES = CLEANFILES = config.log *.test.c # and we'll need to clean up our generated files for distclean -DISTCLEANFILES = $(SCRIPTS_SHELL) $(SCRIPTS_PERL) $(SCRIPTS_AWK) +DISTCLEANFILES = $(SCRIPTS_SHELL) $(SCRIPTS_PERL) $(SCRIPTS_AWK) \ + $(SCRIPTS_INCLUDE) $(am__append_1) MAINTAINERCLEANFILES = # syntax-check shell scripts on 'make check' @@ -891,6 +971,25 @@ CHECK_SHELL = $(SCRIPTS_SHELL) # sed expression to strip leading directories from a filename; this converts e.g., # src/foo/bar.so to bar.so. strip_leading_dirs = s|^.*/|| +@WANT_INSTALLPERMS_FALSE@do_file = pa="$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \ +@WANT_INSTALLPERMS_FALSE@ echo "installperm \"$$chown\" \"$$chmod\" \"$$pa\"" >> "$(installperms_sh)" + + +# define a snippet of the scripts below to either perform a chown/chmod operation, +# or record that operation in the logfile. On entry to the snippet, $$dest is the +# destination directory, $$cmd is the srcdir-relative pathname of the target file, +# $$chown is the ownership, and $$chmod is the permission pattern. +@WANT_INSTALLPERMS_TRUE@do_file = pa="$(DESTDIR)$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \ +@WANT_INSTALLPERMS_TRUE@ if test -n "$$chown"; then \ +@WANT_INSTALLPERMS_TRUE@ echo chown "$$chown" "$$pa"; \ +@WANT_INSTALLPERMS_TRUE@ chown "$$chown" "$$pa" || exit 1; \ +@WANT_INSTALLPERMS_TRUE@ fi; \ +@WANT_INSTALLPERMS_TRUE@ if test -n "$$chmod"; then \ +@WANT_INSTALLPERMS_TRUE@ echo chmod "$$chmod" "$$pa"; \ +@WANT_INSTALLPERMS_TRUE@ chmod "$$chmod" "$$pa" || exit 1; \ +@WANT_INSTALLPERMS_TRUE@ fi + +@WANT_INSTALLPERMS_FALSE@installperms_sh = "$(top_builddir)/installperms.sh" INCLUDES = -I$(top_builddir)/common-src \ -I$(top_srcdir)/common-src \ -I$(top_srcdir)/restore-src \ @@ -909,31 +1008,28 @@ CHECK_PERL = \ amaddclient \ amoverview \ amserverconfig \ - amstatus \ - amtoc - -SCRIPTS_PERL = \ - $(CHECK_PERL) \ + amtoc \ amdevcheck \ - amcheckdump + amcheckdump \ + amcleanup \ + amvault \ + amstatus +SCRIPTS_PERL = $(CHECK_PERL) SCRIPTS_SHELL = \ amcheckdb \ - amcleanup \ amdump \ - amrmtape \ - amverify \ - amverifyrun + amrmtape sbin_SCRIPTS = $(SCRIPTS_PERL) $(SCRIPTS_SHELL) INSTALLPERMS_exec = \ dest=$(sbindir) chown=amanda chmod= \ $(sbin_PROGRAMS) \ - chown=root chmod=u+s,o-rwx \ - amcheck \ + chown=root chmod=04750 \ + amcheck amservice \ dest=$(amlibexecdir) chown=amanda chmod= \ $(amlibexec_PROGRAMS) \ - chown=root chmod=u+s,o-rwx \ + chown=root chmod=04750 \ dumper planner INSTALLPERMS_data = \ @@ -953,7 +1049,6 @@ LDADD = ../common-src/libamanda.la \ libamserver.la \ ../device-src/libamdevice.la \ ../common-src/libamanda.la \ - ../gnulib/libgnu.la \ $(READLINE_LIBS) libamserver_la_SOURCES = amindex.c changer.c \ @@ -995,7 +1090,6 @@ TEST_PROGS = diskfile infofile amindexd_CSRC = amindexd.c disk_history.c list_dir.c amindexd_SOURCES = disk_history.h list_dir.h $(amindexd_CSRC) amreport_SOURCES = reporter.c -amgetconf_SOURCES = getconf.c noinst_HEADERS = amindex.h changer.h cmdline.h \ diskfile.h driverio.h \ holding.h infofile.h logfile.h \ @@ -1046,8 +1140,8 @@ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES) @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ else :; fi; \ done @@ -1055,8 +1149,8 @@ uninstall-amlibLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(amlibdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(amlibdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(amlibdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(amlibdir)/$$p"; \ done clean-amlibLTLIBRARIES: @@ -1078,8 +1172,8 @@ install-amlibexecPROGRAMS: $(amlibexec_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(amlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(amlibexecdir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(amlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(amlibexecdir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(amlibexecdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(amlibexecdir)/$$f" || exit 1; \ else :; fi; \ done @@ -1113,8 +1207,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -1144,9 +1238,6 @@ amcleanupdisk$(EXEEXT): $(amcleanupdisk_OBJECTS) $(amcleanupdisk_DEPENDENCIES) amflush$(EXEEXT): $(amflush_OBJECTS) $(amflush_DEPENDENCIES) @rm -f amflush$(EXEEXT) $(LINK) $(amflush_OBJECTS) $(amflush_LDADD) $(LIBS) -amgetconf$(EXEEXT): $(amgetconf_OBJECTS) $(amgetconf_DEPENDENCIES) - @rm -f amgetconf$(EXEEXT) - $(LINK) $(amgetconf_OBJECTS) $(amgetconf_LDADD) $(LIBS) amindexd$(EXEEXT): $(amindexd_OBJECTS) $(amindexd_DEPENDENCIES) @rm -f amindexd$(EXEEXT) $(LINK) $(amindexd_OBJECTS) $(amindexd_LDADD) $(LIBS) @@ -1159,6 +1250,9 @@ amlogroll$(EXEEXT): $(amlogroll_OBJECTS) $(amlogroll_DEPENDENCIES) amreport$(EXEEXT): $(amreport_OBJECTS) $(amreport_DEPENDENCIES) @rm -f amreport$(EXEEXT) $(LINK) $(amreport_OBJECTS) $(amreport_LDADD) $(LIBS) +amservice$(EXEEXT): $(amservice_OBJECTS) $(amservice_DEPENDENCIES) + @rm -f amservice$(EXEEXT) + $(LINK) $(amservice_OBJECTS) $(amservice_LDADD) $(LIBS) amtape$(EXEEXT): $(amtape_OBJECTS) $(amtape_DEPENDENCIES) @rm -f amtape$(EXEEXT) $(LINK) $(amtape_OBJECTS) $(amtape_LDADD) $(LIBS) @@ -1226,6 +1320,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amindexd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amlabel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amlogroll.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amservice.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amtape.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amtrmidx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amtrmlog.Po@am__quote@ @@ -1239,7 +1334,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/driverio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getconf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/holding.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infofile.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infofile.test.Po@am__quote@ @@ -1290,8 +1384,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1303,8 +1397,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1314,13 +1408,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1401,8 +1494,6 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -@WANT_INSTALLPERMS_FALSE@install-exec-hook: -@WANT_INSTALLPERMS_FALSE@install-data-hook: clean: clean-am clean-am: clean-amlibLTLIBRARIES clean-amlibexecPROGRAMS clean-generic \ @@ -1446,7 +1537,7 @@ install-pdf: install-pdf-am install-ps: install-ps-am -installcheck-am: +installcheck-am: installcheck-local maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) @@ -1483,18 +1574,24 @@ uninstall-am: uninstall-amlibLTLIBRARIES uninstall-amlibexecPROGRAMS \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-sbinPROGRAMS install-sbinSCRIPTS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-amlibLTLIBRARIES uninstall-amlibexecPROGRAMS \ - uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS + install-strip installcheck installcheck-am installcheck-local \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-amlibLTLIBRARIES \ + uninstall-amlibexecPROGRAMS uninstall-sbinPROGRAMS \ + uninstall-sbinSCRIPTS # Perl %: %.pl $(top_builddir)/config.status $(top_builddir)/config.status --file=$@:$< chmod a+x $@ + @if test -f $(top_builddir)/perl/.libs/libCmdline.so -o -f $(top_builddir)/perl/libCmdline.so; then \ + grep -v '^use lib' $@ > $@.nouselib; \ + $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -w -T $@.nouselib || exit 1; \ + rm $@.nouselib; \ + fi %.pl: %.pl.in $(top_builddir)/config.status $(top_builddir)/config.status --file=$@:$< @@ -1520,13 +1617,27 @@ uninstall-am: uninstall-amlibLTLIBRARIES uninstall-amlibexecPROGRAMS \ # syntax-check perl scripts on 'make check' check-perl: $(CHECK_PERL) + @CHECK_PERL="$(CHECK_PERL)"; \ + if test -f $(top_builddir)/perl/.libs/libCmdline.so -o -f $(top_builddir)/perl/libCmdline.so; then \ + if test -n "$(PERL)"; then \ + for perlobj in $$CHECK_PERL; do \ + grep -v '^use lib' $$perlobj > $$perlobj.nouselib; \ + $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -w -T $$perlobj.nouselib || exit 1; \ + rm $$perlobj.nouselib; \ + done; \ + fi \ + fi +check-local: check-perl + +# syntax-check perl scripts on 'make installcheck' +installcheck-perl: $(CHECK_PERL) @CHECK_PERL="$(CHECK_PERL)"; \ if test -n "$(PERL)"; then \ for perlobj in $$CHECK_PERL; do \ $(PERL) $(CHECK_PERL_FLAGS) -c -w -T $$perlobj || exit 1; \ done; \ fi -check-local: check-perl +installcheck-local: installcheck-perl check-shell: $(CHECK_SHELL) @CHECK_SHELL="$(CHECK_SHELL)"; \ if test -n "$$CHECK_SHELL"; then \ @@ -1564,52 +1675,40 @@ dist-scripts: true dist-hook: dist-scripts -@WANT_INSTALLPERMS_TRUE@installperms-exec: -@WANT_INSTALLPERMS_TRUE@ @installperms="$(INSTALLPERMS_exec)"; \ -@WANT_INSTALLPERMS_TRUE@ test -n "$$installperms" && echo "Setting installation permissions on executables"; \ -@WANT_INSTALLPERMS_TRUE@ dest=; chown=; chmod=; \ -@WANT_INSTALLPERMS_TRUE@ for cmd in $$installperms; do \ -@WANT_INSTALLPERMS_TRUE@ case "$$cmd" in \ -@WANT_INSTALLPERMS_TRUE@ chown=amanda) \ -@WANT_INSTALLPERMS_TRUE@ echo " ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \ -@WANT_INSTALLPERMS_TRUE@ dest=*|chown=*|chmod=*) \ -@WANT_INSTALLPERMS_TRUE@ echo " ($$cmd)"; eval $$cmd;; \ -@WANT_INSTALLPERMS_TRUE@ *) pa="$(DESTDIR)$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \ -@WANT_INSTALLPERMS_TRUE@ if test -n "$$chown"; then \ -@WANT_INSTALLPERMS_TRUE@ echo chown "$$chown" "$$pa"; \ -@WANT_INSTALLPERMS_TRUE@ chown "$$chown" "$$pa" || exit 1; \ -@WANT_INSTALLPERMS_TRUE@ fi; \ -@WANT_INSTALLPERMS_TRUE@ if test -n "$$chmod"; then \ -@WANT_INSTALLPERMS_TRUE@ echo chmod "$$chmod" "$$pa"; \ -@WANT_INSTALLPERMS_TRUE@ chmod "$$chmod" "$$pa" || exit 1; \ -@WANT_INSTALLPERMS_TRUE@ fi; \ -@WANT_INSTALLPERMS_TRUE@ esac; \ -@WANT_INSTALLPERMS_TRUE@ done - -@WANT_INSTALLPERMS_TRUE@installperms-data: -@WANT_INSTALLPERMS_TRUE@ @installperms="$(INSTALLPERMS_data)"; \ -@WANT_INSTALLPERMS_TRUE@ test -n "$$installperms" && echo "Setting installation permissions on data"; \ -@WANT_INSTALLPERMS_TRUE@ dest=; chown=; chmod=; \ -@WANT_INSTALLPERMS_TRUE@ for cmd in $$installperms; do \ -@WANT_INSTALLPERMS_TRUE@ case "$$cmd" in \ -@WANT_INSTALLPERMS_TRUE@ chown=amanda) \ -@WANT_INSTALLPERMS_TRUE@ echo " ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \ -@WANT_INSTALLPERMS_TRUE@ dest=*|chown=*|chmod=*) \ -@WANT_INSTALLPERMS_TRUE@ echo " ($$cmd)"; eval $$cmd;; \ -@WANT_INSTALLPERMS_TRUE@ *) pa="$(DESTDIR)$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \ -@WANT_INSTALLPERMS_TRUE@ if test -n "$$chown"; then \ -@WANT_INSTALLPERMS_TRUE@ echo chown "$$chown" "$$pa"; \ -@WANT_INSTALLPERMS_TRUE@ chown "$$chown" "$$pa" || exit 1; \ -@WANT_INSTALLPERMS_TRUE@ fi; \ -@WANT_INSTALLPERMS_TRUE@ if test -n "$$chmod"; then \ -@WANT_INSTALLPERMS_TRUE@ echo chmod "$$chmod" "$$pa"; \ -@WANT_INSTALLPERMS_TRUE@ chmod "$$chmod" "$$pa" || exit 1; \ -@WANT_INSTALLPERMS_TRUE@ fi; \ -@WANT_INSTALLPERMS_TRUE@ esac; \ -@WANT_INSTALLPERMS_TRUE@ done - -@WANT_INSTALLPERMS_TRUE@install-exec-hook: installperms-exec -@WANT_INSTALLPERMS_TRUE@install-data-hook: installperms-data +installperms-exec: + @installperms="$(INSTALLPERMS_exec)"; \ + test -n "$$installperms" && echo "Setting installation permissions on executables"; \ + dest=; chown=; chmod=; \ + for cmd in $$installperms; do \ + case "$$cmd" in \ + chown=amanda) \ + echo " ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \ + dest=*|chown=*|chmod=*) \ + echo " ($$cmd)"; eval $$cmd;; \ + *) $(do_file) ;; \ + esac; \ + done + +installperms-data: + @installperms="$(INSTALLPERMS_data)"; \ + dest=; chown=; chmod=; \ + for cmd in $$installperms; do \ + case "$$cmd" in \ + chown=amanda) \ + echo " ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \ + dest=*|chown=*|chmod=*) \ + echo " ($$cmd)"; eval $$cmd;; \ + *) $(do_file) ;; \ + esac; \ + done + +install-exec-hook: installperms-exec +install-data-hook: installperms-data + +# define a rule to initialize the installperms manifest file +@WANT_INSTALLPERMS_TRUE@installperms-init: +@WANT_INSTALLPERMS_FALSE@installperms-init: +@WANT_INSTALLPERMS_FALSE@ rm -f "$(installperms_sh)" # A rule to make precompiler output from C files. This is not used during # ordinary builds, but but can very useful in debugging problems on strange @@ -1623,20 +1722,17 @@ dist-hook: dist-scripts lint: @ for p in $(amlibexec_PROGRAMS) $(sbin_PROGRAMS); do \ + p=`basename $$p $(EXEEXT)`; \ if [ $$p = "amindexd" ]; then \ s="$(amindexd_CSRC)"; \ elif [ $$p = "amreport" ]; then \ s="$(amreport_SOURCES)"; \ - elif [ $$p = "amgetconf" ]; then \ - s="$(getconf_SOURCES)"; \ else \ s=$$p.c; \ fi; \ f="$$s $(libamserver_la_SOURCES)"; \ (cd ../common-src; make listlibsrc); \ f="$$f "`cat ../common-src/listlibsrc.output`; \ - (cd ../tape-src; make listlibsrc); \ - f="$$f "`cat ../tape-src/listlibsrc.output`; \ echo $(LINT) $$f; \ $(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(top_builddir)/config \ $(INCLUDES) $$f; \