.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index bfde89716e27a9ec702232e8aad36d3236880eed..8f81e3dd7f23faa34bc1762b687cddc6b87a44a8 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -45,21 +45,23 @@ noinst_PROGRAMS = t-fpending$(EXEEXT)
 subdir = lib
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        ChangeLog TODO __fpending.c alloca.c asnprintf.c asprintf.c \
-       atexit.c calloc.c chown.c dirfd.c dup2.c error.c error.h \
-       euidaccess.c fchdir-stub.c fchown-stub.c fileblocks.c \
-       fnmatch.c free.c fsusage.c ftruncate.c getcwd.c getdate.c \
-       getgroups.c gethostname.c getline.c getloadavg.c getndelim2.c \
-       getopt.c getopt1.c getpass.c gettimeofday.c getusershell.c \
-       group-member.c lchown.c lstat.c malloc.c memchr.c memcmp.c \
-       memcpy.c memmove.c mempcpy.c memrchr.c memset.c mkdir.c \
+       atexit.c calloc.c chdir-long.c chdir-long.h chown.c dirfd.c \
+       dup2.c error.c error.h euidaccess.c fchdir-stub.c \
+       fchown-stub.c fileblocks.c fnmatch.c free.c fsusage.c \
+       ftruncate.c getcwd.c getdate.c getgroups.c gethostname.c \
+       getline.c getloadavg.c getndelim2.c getopt.c getopt1.c \
+       getpass.c gettimeofday.c getusershell.c group-member.c \
+       lchown.c lchown.h lstat.c malloc.c memchr.c memcmp.c memcpy.c \
+       memmove.c mempcpy.c mempcpy.h memrchr.c memset.c mkdir.c \
        mkstemp.c mktime.c mountlist.c nanosleep.c obstack.c obstack.h \
-       openat.c printf-args.c printf-parse.c putenv.c raise.c \
-       readlink.c readutmp.c realloc.c regex.c rename.c rmdir.c \
-       rpmatch.c setenv.c sig2str.c stat.c stpcpy.c strcasecmp.c \
-       strcspn.c strdup.c strncasecmp.c strndup.c strnlen.c strpbrk.c \
-       strstr.c strtod.c strtoimax.c strtol.c strtoll.c strtoul.c \
-       strtoull.c strtoumax.c strverscmp.c tempname.c unsetenv.c \
-       utime.c vasnprintf.c vasprintf.c
+       openat.c openat.h printf-args.c printf-parse.c putenv.c \
+       raise.c readlink.c readutmp.c realloc.c regex.c rename.c \
+       rmdir.c rpmatch.c save-cwd.c save-cwd.h setenv.c sig2str.c \
+       stat.c stpcpy.c strcasecmp.c strcspn.c strdup.c strncasecmp.c \
+       strndup.c strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c \
+       strtol.c strtoll.c strtoul.c strtoull.c strtoumax.c \
+       strverscmp.c tempname.c unsetenv.c utime.c vasnprintf.c \
+       vasprintf.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
        $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
@@ -179,31 +181,30 @@ am_libfetish_a_OBJECTS = acl.$(OBJEXT) getdate.$(OBJEXT) \
        hash.$(OBJEXT) hash-pjw.$(OBJEXT) allocsa.$(OBJEXT) \
        argmatch.$(OBJEXT) backupfile.$(OBJEXT) basename.$(OBJEXT) \
        c-strtod.$(OBJEXT) c-strtold.$(OBJEXT) canon-host.$(OBJEXT) \
-       canonicalize.$(OBJEXT) chdir-long.$(OBJEXT) cloexec.$(OBJEXT) \
-       closeout.$(OBJEXT) cycle-check.$(OBJEXT) diacrit.$(OBJEXT) \
-       dirname.$(OBJEXT) dup-safer.$(OBJEXT) exclude.$(OBJEXT) \
-       exitfail.$(OBJEXT) filemode.$(OBJEXT) file-type.$(OBJEXT) \
-       fopen-safer.$(OBJEXT) fts.$(OBJEXT) full-read.$(OBJEXT) \
-       full-write.$(OBJEXT) gettime.$(OBJEXT) getugroups.$(OBJEXT) \
-       hard-locale.$(OBJEXT) human.$(OBJEXT) idcache.$(OBJEXT) \
-       imaxtostr.$(OBJEXT) linebuffer.$(OBJEXT) \
-       localcharset.$(OBJEXT) long-options.$(OBJEXT) \
-       makepath.$(OBJEXT) mbswidth.$(OBJEXT) md5.$(OBJEXT) \
-       memcasecmp.$(OBJEXT) memcoll.$(OBJEXT) modechange.$(OBJEXT) \
-       offtostr.$(OBJEXT) open-safer.$(OBJEXT) path-concat.$(OBJEXT) \
-       physmem.$(OBJEXT) quote.$(OBJEXT) quotearg.$(OBJEXT) \
-       readtokens0.$(OBJEXT) readtokens.$(OBJEXT) \
+       canonicalize.$(OBJEXT) cloexec.$(OBJEXT) closeout.$(OBJEXT) \
+       cycle-check.$(OBJEXT) diacrit.$(OBJEXT) dirname.$(OBJEXT) \
+       dup-safer.$(OBJEXT) exclude.$(OBJEXT) exitfail.$(OBJEXT) \
+       filemode.$(OBJEXT) file-type.$(OBJEXT) fopen-safer.$(OBJEXT) \
+       fts.$(OBJEXT) full-read.$(OBJEXT) full-write.$(OBJEXT) \
+       gettime.$(OBJEXT) getugroups.$(OBJEXT) hard-locale.$(OBJEXT) \
+       human.$(OBJEXT) idcache.$(OBJEXT) imaxtostr.$(OBJEXT) \
+       linebuffer.$(OBJEXT) localcharset.$(OBJEXT) \
+       long-options.$(OBJEXT) makepath.$(OBJEXT) mbswidth.$(OBJEXT) \
+       md5.$(OBJEXT) memcasecmp.$(OBJEXT) memcoll.$(OBJEXT) \
+       modechange.$(OBJEXT) offtostr.$(OBJEXT) open-safer.$(OBJEXT) \
+       path-concat.$(OBJEXT) physmem.$(OBJEXT) quote.$(OBJEXT) \
+       quotearg.$(OBJEXT) readtokens0.$(OBJEXT) readtokens.$(OBJEXT) \
        root-dev-ino.$(OBJEXT) safe-read.$(OBJEXT) \
-       safe-write.$(OBJEXT) same.$(OBJEXT) save-cwd.$(OBJEXT) \
-       savedir.$(OBJEXT) settime.$(OBJEXT) sha1.$(OBJEXT) \
-       stripslash.$(OBJEXT) time_r.$(OBJEXT) umaxtostr.$(OBJEXT) \
-       unicodeio.$(OBJEXT) userspec.$(OBJEXT) utimecmp.$(OBJEXT) \
-       utimens.$(OBJEXT) version-etc.$(OBJEXT) xalloc-die.$(OBJEXT) \
-       xfts.$(OBJEXT) xgetcwd.$(OBJEXT) xgethostname.$(OBJEXT) \
-       xmalloc.$(OBJEXT) xmemcoll.$(OBJEXT) xnanosleep.$(OBJEXT) \
-       xreadlink.$(OBJEXT) xstrndup.$(OBJEXT) xstrtod.$(OBJEXT) \
-       xstrtoimax.$(OBJEXT) xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) \
-       xstrtoumax.$(OBJEXT) yesno.$(OBJEXT)
+       safe-write.$(OBJEXT) same.$(OBJEXT) savedir.$(OBJEXT) \
+       settime.$(OBJEXT) sha1.$(OBJEXT) stripslash.$(OBJEXT) \
+       time_r.$(OBJEXT) umaxtostr.$(OBJEXT) unicodeio.$(OBJEXT) \
+       userspec.$(OBJEXT) utimecmp.$(OBJEXT) utimens.$(OBJEXT) \
+       version-etc.$(OBJEXT) xalloc-die.$(OBJEXT) xfts.$(OBJEXT) \
+       xgetcwd.$(OBJEXT) xgethostname.$(OBJEXT) xmalloc.$(OBJEXT) \
+       xmemcoll.$(OBJEXT) xnanosleep.$(OBJEXT) xreadlink.$(OBJEXT) \
+       xstrndup.$(OBJEXT) xstrtod.$(OBJEXT) xstrtoimax.$(OBJEXT) \
+       xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) xstrtoumax.$(OBJEXT) \
+       yesno.$(OBJEXT)
 libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 t_fpending_SOURCES = t-fpending.c
@@ -355,37 +356,35 @@ libfetish_a_SOURCES = acl.h acl.c getdate.h getdate.y posixtm.c \
        hash.h hash-pjw.c hash-pjw.h __fpending.h allocsa.c allocsa.h \
        argmatch.c argmatch.h backupfile.c backupfile.h basename.c \
        c-strtod.c c-strtod.h c-strtold.c canon-host.c canonicalize.c \
-       canonicalize.h chdir-long.c chdir-long.h cloexec.c cloexec.h \
-       closeout.c closeout.h cycle-check.c cycle-check.h dev-ino.h \
-       diacrit.c diacrit.h dirname.c dirname.h dirfd.h dup-safer.c \
-       euidaccess.h exclude.c exclude.h exit.h exitfail.c exitfail.h \
-       fcntl-safer.h filemode.c filemode.h file-type.c file-type.h \
-       fopen-safer.c fsusage.h fts.c fts_.h full-read.c full-read.h \
-       full-write.c full-write.h getcwd.h getline.h getpagesize.h \
-       getpass.h gettime.c gettext.h getugroups.c group-member.h \
-       hard-locale.c hard-locale.h human.c human.h idcache.c \
-       imaxtostr.c lchown.h linebuffer.c linebuffer.h localcharset.c \
-       localcharset.h long-options.c long-options.h makepath.c \
-       makepath.h mbswidth.c mbswidth.h md5.c md5.h memcasecmp.c \
-       memcasecmp.h memcoll.c memcoll.h mempcpy.h modechange.c \
-       modechange.h mountlist.h offtostr.c openat.h open-safer.c \
-       path-concat.c path-concat.h pathmax.h physmem.c physmem.h \
-       quote.c quote.h quotearg.c quotearg.h readtokens0.c \
+       canonicalize.h cloexec.c cloexec.h closeout.c closeout.h \
+       cycle-check.c cycle-check.h dev-ino.h diacrit.c diacrit.h \
+       dirname.c dirname.h dirfd.h dup-safer.c euidaccess.h exclude.c \
+       exclude.h exit.h exitfail.c exitfail.h fcntl-safer.h \
+       filemode.c filemode.h file-type.c file-type.h fopen-safer.c \
+       fsusage.h fts.c fts_.h full-read.c full-read.h full-write.c \
+       full-write.h getcwd.h getline.h getpagesize.h getpass.h \
+       gettime.c gettext.h getugroups.c group-member.h hard-locale.c \
+       hard-locale.h human.c human.h idcache.c imaxtostr.c \
+       linebuffer.c linebuffer.h localcharset.c localcharset.h \
+       long-options.c long-options.h makepath.c makepath.h mbswidth.c \
+       mbswidth.h md5.c md5.h memcasecmp.c memcasecmp.h memcoll.c \
+       memcoll.h modechange.c modechange.h mountlist.h offtostr.c \
+       open-safer.c path-concat.c path-concat.h pathmax.h physmem.c \
+       physmem.h quote.c quote.h quotearg.c quotearg.h readtokens0.c \
        readtokens0.h readtokens.c readtokens.h readutmp.h regex.h \
        root-dev-ino.c root-dev-ino.h safe-read.c safe-read.h \
-       safe-write.c safe-write.h same.c same.h save-cwd.c save-cwd.h \
-       savedir.c savedir.h setenv.h settime.c sha1.c sha1.h sig2str.h \
-       stat-macros.h stdio-safer.h stripslash.c strdup.h strndup.h \
-       strverscmp.h time_r.c time_r.h timespec.h umaxtostr.c \
-       unicodeio.c unicodeio.h unistd-safer.h unlocked-io.h \
-       userspec.c userspec.h utimecmp.c utimecmp.h utimens.c \
-       utimens.h version-etc.c version-etc.h xalloc.h xalloc-die.c \
-       xfts.c xfts.h xgetcwd.c xgetcwd.h xgethostname.c \
-       xgethostname.h xmalloc.c xmemcoll.c xmemcoll.h xnanosleep.c \
-       xnanosleep.h xreadlink.c xreadlink.h xstrndup.c xstrndup.h \
-       xstrtod.c xstrtod.h xstrtoimax.c xstrtol.c xstrtol.h \
-       xstrtoul.c xstrtoumax.c yesno.c yesno.h printf-args.h \
-       printf-parse.h vasprintf.h vasnprintf.h
+       safe-write.c safe-write.h same.c same.h savedir.c savedir.h \
+       setenv.h settime.c sha1.c sha1.h sig2str.h stat-macros.h \
+       stdio-safer.h stripslash.c strdup.h strndup.h strverscmp.h \
+       time_r.c time_r.h timespec.h umaxtostr.c unicodeio.c \
+       unicodeio.h unistd-safer.h unlocked-io.h userspec.c userspec.h \
+       utimecmp.c utimecmp.h utimens.c utimens.h version-etc.c \
+       version-etc.h xalloc.h xalloc-die.c xfts.c xfts.h xgetcwd.c \
+       xgetcwd.h xgethostname.c xgethostname.h xmalloc.c xmemcoll.c \
+       xmemcoll.h xnanosleep.c xnanosleep.h xreadlink.c xreadlink.h \
+       xstrndup.c xstrndup.h xstrtod.c xstrtod.h xstrtoimax.c \
+       xstrtol.c xstrtol.h xstrtoul.c xstrtoumax.c yesno.c yesno.h \
+       printf-args.h printf-parse.h vasprintf.h vasnprintf.h
 libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 lib_OBJECTS = $(libfetish_a_OBJECTS)
@@ -461,6 +460,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/atexit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/calloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chdir-long.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dirfd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@
@@ -513,6 +513,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rmdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rpmatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/save-cwd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sig2str.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stat.Po@am__quote@
@@ -547,7 +548,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strtold.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon-host.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chdir-long.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cycle-check.Po@am__quote@
@@ -594,7 +594,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-write.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savedir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@

diff --git a/src/Makefile.in b/src/Makefile.in
index e2f1d4d985bc4fbe74f057f20e5d2bf534b6d386..927186c91567d25dfc89178f66065ca62adec61e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -943,7 +943,7 @@ uninstall-binPROGRAMS:
        done
 
 clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
        bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \