.

15 files changed, 34 insertions, 81 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 88739bd6f..72ad02ff8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -109,6 +109,7 @@ EXTRA_DIST = perm.texi getdate.texi
 # and those names all map to one 14-byte name (<package>.info-) on some crufty
 # old systems.
 MAKEINFO = makeinfo --no-split
+subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -235,8 +236,9 @@ uninstall-info:
 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \
-	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
+	    d=$(srcdir); \
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file"; \
+	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file; \
 	  done; \
 	else :; fi
 	@$(NORMAL_UNINSTALL)
@@ -284,8 +286,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = doc
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index b753d58fa..d7b81333a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -127,6 +127,7 @@ version-etc.h xalloc.h xstrtol.h
 BUILT_SOURCES = getdate.c lstat.c stat.c
 
 EXTRA_DIST = xstat.in
+subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -138,6 +139,7 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ANSI2KNR = ../src/ansi2knr
+libfu_a_AR = $(AR) cru
 am_libfu_a_OBJECTS =  getdate$U.o posixtm$U.o getopt$U.o getopt1$U.o \
 addext$U.o argmatch$U.o backupfile$U.o basename$U.o closeout$U.o \
 dirname$U.o exclude$U.o filemode$U.o full-write$U.o human$U.o \
@@ -148,8 +150,8 @@ xmalloc$U.o xstrdup$U.o xstrtol$U.o xstrtoul$U.o xstrtoumax$U.o \
 yesno$U.o
 libfu_a_OBJECTS =  $(am_libfu_a_OBJECTS)
 AR = ar
-CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CFLAGS = @CFLAGS@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES =  $(libfu_a_SOURCES)
@@ -158,11 +160,11 @@ HEADERS =  $(noinst_HEADERS)
 DIST_COMMON =  $(noinst_HEADERS) Makefile.am Makefile.in TODO alloca.c \
 chown.c dup2.c error.c error.h euidaccess.c fileblocks.c fnmatch.c \
 fsusage.c ftruncate.c getdate.c getgroups.c getline.c group-member.c \
-lchown.c lstat.c malloc.c memcmp.c memcpy.c memset.c mkdir.c mktime.c \
+lchown.c malloc.c memcmp.c memcpy.c memset.c mkdir.c mktime.c \
 mountlist.c obstack.c obstack.h realloc.c regex.c rename.c rmdir.c \
-rpmatch.c stat.c stpcpy.c strcasecmp.c strdup.c strftime.c \
-strncasecmp.c strndup.c strstr.c strtol.c strtoul.c strtoull.c \
-strtoumax.c strverscmp.c utime.c
+rpmatch.c stpcpy.c strcasecmp.c strdup.c strftime.c strncasecmp.c \
+strndup.c strstr.c strtol.c strtoul.c strtoull.c strtoumax.c \
+strverscmp.c utime.c
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -235,49 +237,13 @@ clean-kr:
 distclean-kr:
 
 maintainer-clean-kr:
-getdate$U.o:
-posixtm$U.o:
-getopt$U.o:
-getopt1$U.o:
-addext$U.o:
-argmatch$U.o:
-backupfile$U.o:
-basename$U.o:
-closeout$U.o:
-dirname$U.o:
-exclude$U.o:
-filemode$U.o:
-full-write$U.o:
-human$U.o:
-idcache$U.o:
-isdir$U.o:
-long-options$U.o:
-makepath$U.o:
-modechange$U.o:
-hash$U.o:
-path-concat$U.o:
-quotearg$U.o:
-safe-read$U.o:
-save-cwd$U.o:
-savedir$U.o:
-stripslash$U.o:
-userspec$U.o:
-version-etc$U.o:
-xgetcwd$U.o:
-xmalloc$U.o:
-xstrdup$U.o:
-xstrtol$U.o:
-xstrtoul$U.o:
-xstrtoumax$U.o:
-yesno$U.o:
 
 libfu.a: $(libfu_a_OBJECTS) $(libfu_a_DEPENDENCIES)
 	-rm -f libfu.a
-	$(AR) cru libfu.a $(libfu_a_OBJECTS) $(libfu_a_LIBADD)
+	$(libfu_a_AR) libfu.a $(libfu_a_OBJECTS) $(libfu_a_LIBADD)
 	$(RANLIB) libfu.a
-getdate.o:
-lstat.o:
-stat.o:
+.c.o:
+	$(COMPILE) -c $<
 addext_.c: addext.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/addext.c; then echo $(srcdir)/addext.c; else echo addext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > addext_.c
 alloca_.c: alloca.c $(ANSI2KNR)
@@ -482,8 +448,6 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = lib
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
@@ -516,8 +480,8 @@ distclean-depend:
 maintainer-clean-depend:
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $<
+	@echo '$(COMPILE) -c -o $@ $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
 	@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
 	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
@@ -525,8 +489,8 @@ maintainer-clean-depend:
 	rm .deps/$(*D)/$(*F).pp
 
 %.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $<
+	@echo '$(LTCOMPILE) -c -o $@ $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
 	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
 	  < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 3eeb648b3..e392cd884 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -66,6 +66,7 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
+DF_PROG = @DF_PROG@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GMOFILES = @GMOFILES@
@@ -82,16 +83,17 @@ LIBOBJS = @LIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MVDIR_PROG = @MVDIR_PROG@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
-POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+YACC = @YACC@
 l = @l@
 
 
@@ -147,6 +149,7 @@ utime.m4 \
 utimes.m4 \
 xstrtoumax.m4
 
+subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -172,8 +175,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = m4
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index 8d62e8247..563f5e393 100644
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -104,6 +104,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PATH=`pwd`/../../src:$$PATH
 
+subdir = tests/chmod
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -129,8 +130,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/chmod
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index 4dfd7a6c1..fcf73faf8 100644
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -107,6 +107,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PATH=`pwd`/../../src:$$PATH
 
+subdir = tests/cp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -132,8 +133,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/cp
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index d8bf496c3..59341eea8 100644
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -108,6 +108,7 @@ TESTS_ENVIRONMENT = \
 
 
 TESTS = misc
+subdir = tests/dd
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -133,8 +134,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/dd
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index 20c85ba14..0c8b5f99d 100644
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -108,6 +108,7 @@ TESTS_ENVIRONMENT = \
 
 
 TESTS = simple
+subdir = tests/dircolors
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -133,8 +134,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/dircolors
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index b32dd496d..53b0c6ad3 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -107,6 +107,7 @@ TESTS_ENVIRONMENT = \
   MKDIR=../../src/mkdir \
   RM=../../src/rm
 
+subdir = tests/install
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -132,8 +133,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/install
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index 38facbc88..22c0f0244 100644
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -104,6 +104,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PATH=`pwd`/../../src:$$PATH
 
+subdir = tests/ln
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -129,8 +130,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/ln
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index 744f9eb53..96097e8b3 100644
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -108,6 +108,7 @@ TESTS_ENVIRONMENT = \
 
 
 TESTS = tests
+subdir = tests/ls-2
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -133,8 +134,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/ls-2
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 447bc65bf..85ab19c03 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -102,6 +102,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 TESTS = rt-1 time-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = LS=../../src/ls TOUCH=../../src/touch
+subdir = tests/ls
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -127,8 +128,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/ls
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index 60dfbaa79..0d3cd4f48 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -102,6 +102,7 @@ AUTOMAKE_OPTIONS = 1.1 gnits
 TESTS = p-1 p-2
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = MKDIR=../../src/mkdir
+subdir = tests/mkdir
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -127,8 +128,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/mkdir
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index c0a49e93f..268b96b17 100644
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -117,6 +117,7 @@ TESTS_ENVIRONMENT = \
   PATH=../../src:$$PATH \
   PROG=mv
 
+subdir = tests/mv
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -142,8 +143,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/mv
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 479b5e7c0..bd7aa8d41 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -110,6 +110,7 @@ TESTS_ENVIRONMENT = \
   PATH=../../src:$$PATH \
   PROG=rm
 
+subdir = tests/rm
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -135,8 +136,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/rm
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index 6ce893aad..6ea1b75ca 100644
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -104,6 +104,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PATH=../../src:$$PATH
 
+subdir = tests/touch
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -129,8 +130,6 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = tests/touch
-
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \