.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 384350162845dfb46da9d7e564ca9e76643f021f..9ed4c0fca9fe98cbb92a34589db65cad3de3d992 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -60,30 +60,31 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        getopt1.c getpagesize.h getpass.c gettime.c gettimeofday.c \
        getugroups.c getusershell.c group-member.c group-member.h \
        hard-locale.c hard-locale.h hash-pjw.c hash-pjw.h hash.c \
-       hash.h human.c human.h idcache.c imaxtostr.c inttostr.c \
-       inttostr.h lchown.c lchown.h linebuffer.c linebuffer.h \
-       long-options.c long-options.h lstat.c makepath.c makepath.h \
-       malloc.c md5.c md5.h memcasecmp.c memcasecmp.h memchr.c \
-       memcmp.c memcoll.c memcoll.h memcpy.c memmove.c mempcpy.c \
-       mempcpy.h memrchr.c memrchr.h memset.c mkdir.c mkstemp.c \
-       mktime.c modechange.c modechange.h mountlist.c mountlist.h \
-       nanosleep.c obstack.c obstack.h offtostr.c openat.c openat.h \
-       path-concat.c path-concat.h pathmax.h physmem.c physmem.h \
-       posixtm.c posixtm.h posixver.c posixver.h printf-args.c \
-       printf-parse.c putenv.c quote.c quote.h quotearg.c quotearg.h \
-       raise.c readlink.c readtokens.c readtokens.h readutmp.c \
-       readutmp.h realloc.c regex.c rename.c rmdir.c rpmatch.c \
-       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.c \
-       setenv.h settime.c sha1.c sha1.h sig2str.c sig2str.h stat.c \
-       stpcpy.c strcasecmp.c strcspn.c strdup.c strdup.h strftime.c \
-       strftime.h stripslash.c strncasecmp.c strndup.c strndup.h \
-       strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c strtol.c \
-       strtoll.c strtoul.c strtoull.c strtoumax.c strverscmp.c \
-       strverscmp.h tempname.c timespec.h umaxtostr.c unlocked-io.h \
-       unsetenv.c userspec.c userspec.h utime.c utimecmp.c utimecmp.h \
-       utimens.c utimens.h vasnprintf.c vasprintf.c xalloc.h \
-       xmalloc.c xnanosleep.c xnanosleep.h xtime.h yesno.c yesno.h
+       hash.h human.c human.h idcache.c imaxtostr.c intprops.h \
+       inttostr.c inttostr.h lchown.c lchown.h linebuffer.c \
+       linebuffer.h long-options.c long-options.h lstat.c makepath.c \
+       makepath.h malloc.c md5.c md5.h memcasecmp.c memcasecmp.h \
+       memchr.c memcmp.c memcoll.c memcoll.h memcpy.c memmove.c \
+       mempcpy.c mempcpy.h memrchr.c memrchr.h memset.c mkdir.c \
+       mkstemp.c mktime.c modechange.c modechange.h mountlist.c \
+       mountlist.h nanosleep.c obstack.c obstack.h offtostr.c \
+       openat.c openat.h path-concat.c path-concat.h pathmax.h \
+       physmem.c physmem.h posixtm.c posixtm.h posixver.c posixver.h \
+       printf-args.c printf-parse.c putenv.c quote.c quote.h \
+       quotearg.c quotearg.h raise.c readlink.c readtokens.c \
+       readtokens.h readutmp.c readutmp.h realloc.c regex.c rename.c \
+       rmdir.c rpmatch.c 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.c setenv.h settime.c sha1.c sha1.h sig2str.c \
+       sig2str.h stat.c stpcpy.c strcasecmp.c strcspn.c strdup.c \
+       strdup.h strftime.c strftime.h stripslash.c strncasecmp.c \
+       strndup.c strndup.h strnlen.c strpbrk.c strstr.c strtod.c \
+       strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \
+       strtoumax.c strverscmp.c strverscmp.h tempname.c timespec.h \
+       umaxtostr.c unlocked-io.h unsetenv.c userspec.c userspec.h \
+       utime.c utimecmp.c utimecmp.h utimens.c utimens.h vasnprintf.c \
+       vasprintf.c xalloc.h xmalloc.c xnanosleep.c xnanosleep.h \
+       xstrtol.c xstrtol.h xtime.h yesno.c yesno.h
 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 \
@@ -212,7 +213,7 @@ am_libfetish_a_OBJECTS = allocsa.$(OBJEXT) diacrit.$(OBJEXT) \
        xalloc-die.$(OBJEXT) xfts.$(OBJEXT) xgetcwd.$(OBJEXT) \
        xgethostname.$(OBJEXT) xmemcoll.$(OBJEXT) xreadlink.$(OBJEXT) \
        xstrndup.$(OBJEXT) xstrtod.$(OBJEXT) xstrtoimax.$(OBJEXT) \
-       xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) xstrtoumax.$(OBJEXT)
+       xstrtoul.$(OBJEXT) xstrtoumax.$(OBJEXT)
 libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 t_fpending_SOURCES = t-fpending.c
@@ -372,8 +373,8 @@ libfetish_a_SOURCES = allocsa.c allocsa.h dev-ino.h diacrit.c \
        xalloc-die.c xfts.c xfts.h xgetcwd.c xgetcwd.h xgethostname.c \
        xgethostname.h xmemcoll.c xmemcoll.h xreadlink.c xreadlink.h \
        xstrndup.c xstrndup.h xstrtod.c xstrtod.h xstrtoimax.c \
-       xstrtol.c xstrtol.h xstrtoul.c xstrtoumax.c printf-args.h \
-       printf-parse.h vasprintf.h vasnprintf.h
+       xstrtoul.c xstrtoumax.c 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)
@@ -586,6 +587,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xmalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xnanosleep.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrtol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yesno.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocsa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diacrit.Po@am__quote@
@@ -612,7 +614,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtod.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoimax.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoul.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoumax.Po@am__quote@
 

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