eliminate gratuitious comment change in source code

[debian/amanda] / common-src / Makefile.in

diff --git a/common-src/Makefile.in b/common-src/Makefile.in
index 637af48871acb13d6bcc08836b40028ee5e853f7..9d35e45a52b72982c2cce904fe2bd5ab89c95235 100644 (file)
--- a/common-src/Makefile.in
+++ b/common-src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,7 +18,7 @@
 # Makefile for Amanda library.
 
 # vim:ft=automake
-# Copyright (c) 2007,2008,2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -40,7 +40,7 @@
 # scripts in this directory.
 
 # vim:ft=automake
-# Copyright (c) 2007,2008,2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -204,7 +204,7 @@ sbin_PROGRAMS = amservice$(EXEEXT)
 @WANT_KRB5_SECURITY_TRUE@am__append_11 = krb5-security.c
 EXTRA_PROGRAMS = genversion$(EXEEXT) $(am__EXEEXT_1)
 TESTS = amflock-test$(EXEEXT) event-test$(EXEEXT) \
-       semaphore-test$(EXEEXT) quoting-test$(EXEEXT) \
+       amsemaphore-test$(EXEEXT) quoting-test$(EXEEXT) \
        ipc-binary-test$(EXEEXT) hexencode-test$(EXEEXT) \
        fileheader-test$(EXEEXT) match-test$(EXEEXT)
 noinst_PROGRAMS = $(am__EXEEXT_2)
@@ -358,7 +358,8 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/ltoptions.m4 \
        $(top_srcdir)/config/ltsugar.m4 \
        $(top_srcdir)/config/ltversion.m4 \
-       $(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/FULL_VERSION \
+       $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -391,11 +392,11 @@ am__installdirs = "$(DESTDIR)$(amlibdir)" "$(DESTDIR)$(sbindir)" \
        "$(DESTDIR)$(amlibexecdir)"
 LTLIBRARIES = $(amlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 libamanda_la_DEPENDENCIES = ../gnulib/libgnu.la
-am__libamanda_la_SOURCES_DIST = alloc.c amfeatures.c amflock.c \
+am__libamanda_la_SOURCES_DIST = alloc.c am_sl.c amfeatures.c amflock.c \
        ipc-binary.c amxml.c clock.c columnar.c conffile.c debug.c \
        dgram.c event.c file.c fileheader.c glib-util.c match.c \
-       packet.c pipespawn.c protocol.c semaphore.c security.c \
-       security-util.c simpleprng.c sl.c sockaddr-util.c stream.c \
+       packet.c pipespawn.c protocol.c amsemaphore.c security.c \
+       security-util.c simpleprng.c sockaddr-util.c stream.c \
        tapelist.c timestamp.c util.c amflock-posix.c amflock-flock.c \
        amflock-lockf.c amflock-lnlock.c rsh-security.c ssh-security.c \
        bsd-security.c bsdtcp-security.c bsdudp-security.c \
@@ -410,16 +411,16 @@ am__libamanda_la_SOURCES_DIST = alloc.c amfeatures.c amflock.c \
 @WANT_BSDTCP_SECURITY_TRUE@am__objects_8 = bsdtcp-security.lo
 @WANT_BSDUDP_SECURITY_TRUE@am__objects_9 = bsdudp-security.lo
 @WANT_KRB5_SECURITY_TRUE@am__objects_10 = krb5-security.lo
-am_libamanda_la_OBJECTS = alloc.lo amfeatures.lo amflock.lo \
+am_libamanda_la_OBJECTS = alloc.lo am_sl.lo amfeatures.lo amflock.lo \
        ipc-binary.lo amxml.lo clock.lo columnar.lo conffile.lo \
        debug.lo dgram.lo event.lo file.lo fileheader.lo glib-util.lo \
-       match.lo packet.lo pipespawn.lo protocol.lo semaphore.lo \
-       security.lo security-util.lo simpleprng.lo sl.lo \
-       sockaddr-util.lo stream.lo tapelist.lo timestamp.lo util.lo \
-       $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-       $(am__objects_4) $(am__objects_5) $(am__objects_6) \
-       $(am__objects_7) $(am__objects_8) $(am__objects_9) \
-       $(am__objects_10) local-security.lo
+       match.lo packet.lo pipespawn.lo protocol.lo amsemaphore.lo \
+       security.lo security-util.lo simpleprng.lo sockaddr-util.lo \
+       stream.lo tapelist.lo timestamp.lo util.lo $(am__objects_1) \
+       $(am__objects_2) $(am__objects_3) $(am__objects_4) \
+       $(am__objects_5) $(am__objects_6) $(am__objects_7) \
+       $(am__objects_8) $(am__objects_9) $(am__objects_10) \
+       local-security.lo
 nodist_libamanda_la_OBJECTS = version.lo
 libamanda_la_OBJECTS = $(am_libamanda_la_OBJECTS) \
        $(nodist_libamanda_la_OBJECTS)
@@ -431,13 +432,16 @@ am_libtestutils_la_OBJECTS = testutils.lo
 libtestutils_la_OBJECTS = $(am_libtestutils_la_OBJECTS)
 am__EXEEXT_1 = file$(EXEEXT) bsdsecurity$(EXEEXT)
 am__EXEEXT_2 = amflock-test$(EXEEXT) event-test$(EXEEXT) \
-       semaphore-test$(EXEEXT) quoting-test$(EXEEXT) \
+       amsemaphore-test$(EXEEXT) quoting-test$(EXEEXT) \
        ipc-binary-test$(EXEEXT) hexencode-test$(EXEEXT) \
        fileheader-test$(EXEEXT) match-test$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
 am_amflock_test_OBJECTS = amflock-test.$(OBJEXT)
 amflock_test_OBJECTS = $(am_amflock_test_OBJECTS)
 amflock_test_DEPENDENCIES = libamanda.la libtestutils.la
+am_amsemaphore_test_OBJECTS = amsemaphore-test.$(OBJEXT)
+amsemaphore_test_OBJECTS = $(am_amsemaphore_test_OBJECTS)
+amsemaphore_test_DEPENDENCIES = libamanda.la libtestutils.la
 amservice_SOURCES = amservice.c
 amservice_OBJECTS = amservice.$(OBJEXT)
 amservice_LDADD = $(LDADD)
@@ -471,9 +475,6 @@ match_test_DEPENDENCIES = libamanda.la libtestutils.la
 am_quoting_test_OBJECTS = quoting-test.$(OBJEXT)
 quoting_test_OBJECTS = $(am_quoting_test_OBJECTS)
 quoting_test_DEPENDENCIES = libamanda.la libtestutils.la
-am_semaphore_test_OBJECTS = semaphore-test.$(OBJEXT)
-semaphore_test_OBJECTS = $(am_semaphore_test_OBJECTS)
-semaphore_test_DEPENDENCIES = libamanda.la libtestutils.la
 SCRIPTS = $(amlibexec_SCRIPTS) $(sbin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -489,19 +490,19 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(libamanda_la_SOURCES) $(nodist_libamanda_la_SOURCES) \
-       $(libtestutils_la_SOURCES) $(amflock_test_SOURCES) amservice.c \
-       $(bsdsecurity_SOURCES) $(event_test_SOURCES) $(file_SOURCES) \
+       $(libtestutils_la_SOURCES) $(amflock_test_SOURCES) \
+       $(amsemaphore_test_SOURCES) amservice.c $(bsdsecurity_SOURCES) \
+       $(event_test_SOURCES) $(file_SOURCES) \
        $(fileheader_test_SOURCES) $(genversion_SOURCES) \
        $(hexencode_test_SOURCES) $(ipc_binary_test_SOURCES) \
-       $(match_test_SOURCES) $(quoting_test_SOURCES) \
-       $(semaphore_test_SOURCES)
+       $(match_test_SOURCES) $(quoting_test_SOURCES)
 DIST_SOURCES = $(am__libamanda_la_SOURCES_DIST) \
-       $(libtestutils_la_SOURCES) $(amflock_test_SOURCES) amservice.c \
-       $(bsdsecurity_SOURCES) $(event_test_SOURCES) $(file_SOURCES) \
+       $(libtestutils_la_SOURCES) $(amflock_test_SOURCES) \
+       $(amsemaphore_test_SOURCES) amservice.c $(bsdsecurity_SOURCES) \
+       $(event_test_SOURCES) $(file_SOURCES) \
        $(fileheader_test_SOURCES) $(genversion_SOURCES) \
        $(hexencode_test_SOURCES) $(ipc_binary_test_SOURCES) \
-       $(match_test_SOURCES) $(quoting_test_SOURCES) \
-       $(semaphore_test_SOURCES)
+       $(match_test_SOURCES) $(quoting_test_SOURCES)
 DATA = $(amlibexec_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -573,6 +574,7 @@ DEFAULT_TAPE_DEVICE = @DEFAULT_TAPE_DEVICE@
 DEFAULT_TAPE_SERVER = @DEFAULT_TAPE_SERVER@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_DATE = @DOC_BUILD_DATE@
 DSYMUTIL = @DSYMUTIL@
 DUMP = @DUMP@
@@ -1005,6 +1007,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAILER = @MAILER@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
@@ -1013,6 +1016,9 @@ MSGMERGE = @MSGMERGE@
 MT = @MT@
 MTX = @MTX@
 MT_FILE_FLAG = @MT_FILE_FLAG@
+NC = @NC@
+NC6 = @NC6@
+NETCAT = @NETCAT@
 NETINET_IN_H = @NETINET_IN_H@
 NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@
 NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@
@@ -1054,6 +1060,7 @@ NEXT_WCHAR_H = @NEXT_WCHAR_H@
 NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -1062,6 +1069,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCAT = @PCAT@
@@ -1069,6 +1077,8 @@ PERL = @PERL@
 PERLEXTLIBS = @PERLEXTLIBS@
 PERL_INC = @PERL_INC@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PS = @PS@
@@ -1213,6 +1223,7 @@ TCPPORTRANGE = @TCPPORTRANGE@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UDPPORTRANGE = @UDPPORTRANGE@
 UMOUNT = @UMOUNT@
+UNAME = @UNAME@
 UNCOMPRESS_OPT = @UNCOMPRESS_OPT@
 UNCOMPRESS_PATH = @UNCOMPRESS_PATH@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
@@ -1246,6 +1257,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -1288,7 +1300,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1353,21 +1364,21 @@ do_installperms = dest=; chown=; chmod=; \
            esac; \
        done
 
-INCLUDES = -I$(top_srcdir)/gnulib   
+INCLUDES = -I$(top_srcdir)/gnulib
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
 AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 amlib_LTLIBRARIES = libamanda.la
 LINT = $(AMLINT)
 LINTFLAGS = $(AMLINTFLAGS)
-libamanda_la_SOURCES = alloc.c amfeatures.c amflock.c ipc-binary.c \
-       amxml.c clock.c columnar.c conffile.c debug.c dgram.c event.c \
-       file.c fileheader.c glib-util.c match.c packet.c pipespawn.c \
-       protocol.c semaphore.c security.c security-util.c simpleprng.c \
-       sl.c sockaddr-util.c stream.c tapelist.c timestamp.c util.c \
-       $(am__append_2) $(am__append_3) $(am__append_4) \
-       $(am__append_5) $(am__append_6) $(am__append_7) \
-       $(am__append_8) $(am__append_9) $(am__append_10) \
-       $(am__append_11) local-security.c
+libamanda_la_SOURCES = alloc.c am_sl.c amfeatures.c amflock.c \
+       ipc-binary.c amxml.c clock.c columnar.c conffile.c debug.c \
+       dgram.c event.c file.c fileheader.c glib-util.c match.c \
+       packet.c pipespawn.c protocol.c amsemaphore.c security.c \
+       security-util.c simpleprng.c sockaddr-util.c stream.c \
+       tapelist.c timestamp.c util.c $(am__append_2) $(am__append_3) \
+       $(am__append_4) $(am__append_5) $(am__append_6) \
+       $(am__append_7) $(am__append_8) $(am__append_9) \
+       $(am__append_10) $(am__append_11) local-security.c
 # version.c is generated; see below
 nodist_libamanda_la_SOURCES = version.c
 INSTALLPERMS_exec = \
@@ -1400,11 +1411,11 @@ noinst_HEADERS = \
        packet.h                \
        pipespawn.h             \
        protocol.h              \
-       semaphore.h             \
+       amsemaphore.h           \
        security.h              \
        security-util.h         \
        simpleprng.h            \
-       sl.h                    \
+       am_sl.h                 \
        sockaddr-util.h         \
        stream.h                \
        tapelist.h              \
@@ -1473,8 +1484,8 @@ amflock_test_SOURCES = amflock-test.c
 amflock_test_LDADD = libamanda.la libtestutils.la
 event_test_SOURCES = event-test.c
 event_test_LDADD = libamanda.la libtestutils.la
-semaphore_test_SOURCES = semaphore-test.c
-semaphore_test_LDADD = libamanda.la libtestutils.la
+amsemaphore_test_SOURCES = amsemaphore-test.c
+amsemaphore_test_LDADD = libamanda.la libtestutils.la
 quoting_test_SOURCES = quoting-test.c
 quoting_test_LDADD = libamanda.la libtestutils.la
 ipc_binary_test_SOURCES = ipc-binary-test.c
@@ -1644,6 +1655,9 @@ clean-sbinPROGRAMS:
 amflock-test$(EXEEXT): $(amflock_test_OBJECTS) $(amflock_test_DEPENDENCIES) 
        @rm -f amflock-test$(EXEEXT)
        $(LINK) $(amflock_test_OBJECTS) $(amflock_test_LDADD) $(LIBS)
+amsemaphore-test$(EXEEXT): $(amsemaphore_test_OBJECTS) $(amsemaphore_test_DEPENDENCIES) 
+       @rm -f amsemaphore-test$(EXEEXT)
+       $(LINK) $(amsemaphore_test_OBJECTS) $(amsemaphore_test_LDADD) $(LIBS)
 amservice$(EXEEXT): $(amservice_OBJECTS) $(amservice_DEPENDENCIES) 
        @rm -f amservice$(EXEEXT)
        $(LINK) $(amservice_OBJECTS) $(amservice_LDADD) $(LIBS)
@@ -1674,9 +1688,6 @@ match-test$(EXEEXT): $(match_test_OBJECTS) $(match_test_DEPENDENCIES)
 quoting-test$(EXEEXT): $(quoting_test_OBJECTS) $(quoting_test_DEPENDENCIES) 
        @rm -f quoting-test$(EXEEXT)
        $(LINK) $(quoting_test_OBJECTS) $(quoting_test_LDADD) $(LIBS)
-semaphore-test$(EXEEXT): $(semaphore_test_OBJECTS) $(semaphore_test_DEPENDENCIES) 
-       @rm -f semaphore-test$(EXEEXT)
-       $(LINK) $(semaphore_test_OBJECTS) $(semaphore_test_LDADD) $(LIBS)
 install-amlibexecSCRIPTS: $(amlibexec_SCRIPTS)
        @$(NORMAL_INSTALL)
        test -z "$(amlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibexecdir)"
@@ -1753,6 +1764,7 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/am_sl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amfeatures.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amflock-flock.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amflock-lnlock.Plo@am__quote@
@@ -1760,6 +1772,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amflock-posix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amflock-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amflock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amsemaphore-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amsemaphore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amservice.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amxml.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd-security.Plo@am__quote@
@@ -1793,10 +1807,7 @@ distclean-compile:
 @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)/semaphore-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/semaphore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpleprng.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockaddr-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssh-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@