.

2 files changed, 49 insertions, 62 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index f54c5a35e..d16960641 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,4 @@
-# Makefile.in generated automatically by automake 0.28 from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# Makefile.in generated automatically by automake 0.27 from Makefile.am
 
 
 SHELL = /bin/sh
@@ -45,25 +41,19 @@ INFOS = fileutils.info*
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 
-DIST_COMMON = Makefile.am mdate-sh Makefile.in texinfo.tex stamp-vti \
-version.texi
+DIST_COMMON = Makefile.in stamp-vti version.texi mdate-sh Makefile.am \
+texinfo.tex
 
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER) $(DATA)
-DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(DIST_OTHER) $(DATA)
-default: all
-
+DISTFILES = $(SOURCES) $(HEADERS) $(TEXINFOS) $(INFOS) $(MANS) \
+	$(DIST_OTHER) $(DIST_COMMON) $(DATA)
+subdir = doc
 
-$(srcdir)/Makefile.in: Makefile.am
-	cd $(top_srcdir) && automake $(subdir)/Makefile
+default: all
 
-Makefile: ../config.status Makefile.in
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 version.texi: stamp-vti
 
@@ -80,7 +70,7 @@ stamp-vti: fileutils.texi $(top_srcdir)/configure.in
 	echo timestamp > $(srcdir)/stamp-vti
 
 mostlyclean-vti:
-	rm -f version.tmp
+	rm -f *.tmp
 
 clean-vti:
 
@@ -100,8 +90,13 @@ fileutils.info: fileutils.texi version.texi
 install-info: $(INFO_DEPS)
 	$(top_srcdir)/mkinstalldirs $(infodir)
 	for file in $(INFO_DEPS); do		\
-	  for ifile in $(srcdir)/$${file}*; do	\
-	    $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+	  if test -f $$file; then		\
+	    d=.;				\
+	  else					\
+	    d=$(srcdir);			\
+	  fi;					\
+	  for ifile in `cd $$d && echo $${file}*`; do \
+	    $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
 	  done;					\
 	done
 
@@ -121,17 +116,22 @@ distclean-info:
 
 maintainer-clean-info:
 	rm -f $(INFOS)
+
+$(srcdir)/Makefile.in: Makefile.am
+	cd $(top_srcdir) && automake $(subdir)/Makefile
+
+Makefile: ../config.status Makefile.in
+	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 tags: TAGS
 TAGS:
 
 
-subdir = doc
-distdir = $(PACKAGE)-$(VERSION)/$(subdir)
-dist: $(DEP_DISTFILES)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist: $(DISTFILES)
 	@for file in $(DISTFILES); do		\
 	  test -f $(distdir)/$$file \
-	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
+	    || ln $(srcdir)/$$file $(distdir)/$$file \
+	    || cp -p $(srcdir)/$$file $(distdir)/$$file; \
 	done
 all: info
 
@@ -166,7 +166,6 @@ distclean-generic:
 
 maintainer-clean-generic:
 	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-vti mostlyclean-info mostlyclean-generic
 
 clean:  clean-vti clean-info clean-generic mostlyclean 
@@ -178,6 +177,7 @@ maintainer-clean:  maintainer-clean-vti maintainer-clean-info \
 maintainer-clean-generic distclean 
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
+	rm -f config.status
 
 .PHONY: default mostlyclean-vti distclean-vti clean-vti \
 maintainer-clean-vti install-info uninstall-info mostlyclean-info \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 009684a2b..18006e50d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,4 @@
-# Makefile.in generated automatically by automake 0.28 from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# Makefile.in generated automatically by automake 0.27 from Makefile.am
 
 
 SHELL = /bin/sh
@@ -59,7 +55,7 @@ full-write.c getopt.c getopt1.c getversion.c group-member.c idcache.c \
 isdir.c long-options.c makepath.c modechange.c obstack.c \
 safe-read.c save-cwd.c savedir.c stripslash.c userspec.c xgetcwd.c \
 xmalloc.c xstrdup.c xstrtol.c xstrtoul.c yesno.c
-LIBRARIES = $(noinst_LIBRARIES)
+LIBRARIES= $(noinst_LIBRARIES)
 
 noinst_LIBFILES = libfu.a
 
@@ -85,34 +81,22 @@ LIBFILES =  libfu.a
 
 AR = ar
 RANLIB = @RANLIB@
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = Makefile.in Makefile.am
 
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER) $(DATA)
-DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(DIST_OTHER) $(DATA)
-DEP_FILES = .Pdechange.P .Png.Ppt.Pns.P .Psixtm.P argmatch.P \
-backupfile.P basename.P dirname.P er.Pr.P file.Pde.P fileb.Pcks.P \
-full-write.P g.Pup-member.P ge.Ppt.P ge.Ppt1.P getdate.P getvers.Pn.P \
-idcache.P isdir.P makepath.P obstack.P safe-read.P save-cwd.P savedir.P \
-stripslash.P userspec.P xgetcwd.P xmal.Pc.P xstr.Pl.P xstr.Pul.P \
-xstrdup.P yes.P.P
+DISTFILES = $(SOURCES) $(HEADERS) $(TEXINFOS) $(INFOS) $(MANS) \
+	$(DIST_OTHER) $(DIST_COMMON) $(DATA)
+subdir = lib
+
 SOURCES = $(fu_SOURCES)
 OBJECTS = $(fu_OBJECTS)
 
 default: all
 
 
-$(srcdir)/Makefile.in: Makefile.am
-	cd $(top_srcdir) && automake $(subdir)/Makefile
-
-Makefile: ../config.status Makefile.in
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-
 mostlyclean-noinstLIBRARIES:
 
 clean-noinstLIBRARIES:
@@ -141,7 +125,13 @@ libfu.a: $(fu_OBJECTS) $(fu_LIBADD)
 	$(AR) cru libfu.a $(fu_OBJECTS) $(fu_LIBADD)
 	$(RANLIB) libfu.a
 
-ID:	$(HEADERS) $(SOURCES)
+$(srcdir)/Makefile.in: Makefile.am
+	cd $(top_srcdir) && automake $(subdir)/Makefile
+
+Makefile: ../config.status Makefile.in
+	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+
+ID:
 	here=`pwd` && cd $(srcdir) && mkid -f $$here/ID $(SOURCES) $(HEADERS)
 
 tags: TAGS
@@ -158,13 +148,12 @@ distclean-tags:
 
 maintainer-clean-tags:
 
-subdir = lib
-distdir = $(PACKAGE)-$(VERSION)/$(subdir)
-dist: $(DEP_DISTFILES)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist: $(DISTFILES)
 	@for file in $(DISTFILES); do		\
 	  test -f $(distdir)/$$file \
-	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
+	    || ln $(srcdir)/$$file $(distdir)/$$file \
+	    || cp -p $(srcdir)/$$file $(distdir)/$$file; \
 	done
 
 # This fragment is probably only useful for maintainers.  It relies on
@@ -173,6 +162,8 @@ dist: $(DEP_DISTFILES)
 
 MKDEP = gcc -MM $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
+DEP_FILES = $(patsubst %.$(kr)o, $(srcdir)/.deps/%.P,$(OBJECTS))
+
 -include $(srcdir)/.deps/.P
 $(srcdir)/.deps/.P: $(BUILT_SOURCES)
 	cd $(srcdir) && test -d .deps || mkdir .deps
@@ -185,11 +176,7 @@ $(srcdir)/.deps/%.P: $(srcdir)/%.c
 	@echo "mkdeps $< > $@"
 	@re=`echo 's,\<$(srcdir),,g' | sed 's/\./\\./g'`; \
 	  $(MKDEP) $< | sed $$re > $@-tmp
-	@if test -n "$o"; then			\
-	  sed 's/\.o:/$$o:/' $@-tmp > $@;	\
-	else					\
-	  mv $@-tmp $@;				\
-	fi
+	@mv $@-tmp $@
 
 # End of maintainer-only section
 all: $(LIBFILES)
@@ -202,7 +189,7 @@ check: all
 
 installcheck:
 
-install: all
+install: 
 	@:
 
 uninstall: 
@@ -222,7 +209,6 @@ distclean-generic:
 
 maintainer-clean-generic:
 	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 mostlyclean-tags mostlyclean-generic
 
@@ -238,6 +224,7 @@ maintainer-clean-compile maintainer-clean-tags maintainer-clean-generic \
 distclean 
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
+	rm -f config.status
 
 .PHONY: default mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \