Many changes from Franc,ois

15 files changed, 3 insertions, 33 deletions

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 3ede9f998..f818a14d2 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -49,7 +49,7 @@ automake: automake.in
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 cvs-dist: maintainer-check
-	if sed 1q NEWS | grep -e "$(VERSION)"; then :; else \
+	@if sed 1q NEWS | grep -e "$(VERSION)"; then :; else \
 	  echo "NEWS not updated; not releasing" 1>&2; \
 	  exit 1;				\
 	fi
diff --git a/lib/am/clean.am b/lib/am/clean.am
index 927272bdf..85618968c 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -12,4 +12,3 @@ distclean-generic:
 
 maintainer-clean-generic:
 	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-
diff --git a/lib/am/compile.am b/lib/am/compile.am
index 36371bcae..2570db799 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -2,6 +2,7 @@
 	$(COMPILE) $<
 
 mostlyclean-compile:
+## Don't remove 'core.*' because some distributions have eg "core.c".
 	rm -f *.o core
 
 clean-compile:
@@ -10,4 +11,3 @@ distclean-compile:
 	rm -f *.tab.c
 
 maintainer-clean-compile:
-
diff --git a/lib/am/data.am b/lib/am/data.am
index f07b81e81..64270a5b7 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -8,4 +8,3 @@ uninstall-@DIR@DATA:
 	for p in $(@DIR@_DATA); do		\
 	  rm -f $(@DIR@dir)/$$p;		\
 	done
-
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 25b74a8c1..2ebc5d6c9 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -22,8 +22,7 @@ $(DEP_FILES): $(srcdir)/.deps/.P
 
 $(srcdir)/.deps/%.P: $(srcdir)/%.c
 	@echo "mkdeps $< > $@"
-	@$(MKDEP) $< > $@-tmp
+	@$(MKDEP) $< | sed 's,$(srcdir)/,,g' > $@-tmp
 	@mv $@-tmp $@
 
 # End of maintainer-only section
-
diff --git a/lib/am/footer.am b/lib/am/footer.am
index ddf006f2b..739cc5382 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,4 +1,3 @@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index df4831d35..1cfd360e1 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -1,20 +1,3 @@
-# Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
 SHELL = /bin/sh
 
 srcdir = @srcdir@
@@ -46,4 +29,3 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-
diff --git a/lib/am/library.am b/lib/am/library.am
index f45e63274..e8e755027 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -2,4 +2,3 @@ lib@LIBRARY@.a: $(@LIBRARY@_OBJECTS) $(@LIBRARY@_LIBADD)
 	rm -f lib@LIBRARY@.a
 	$(AR) cru lib@LIBRARY@.a $(@LIBRARY@_OBJECTS) $(@LIBRARY@_LIBADD)
 	$(RANLIB) lib@LIBRARY@.a
-
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index d0f972316..2c447038f 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -1,2 +1 @@
 NROFF = nroff
-
diff --git a/lib/am/program.am b/lib/am/program.am
index da9879351..f37fd916b 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,3 +1,2 @@
 @PROGRAM@: $(@PROGRAM@_OBJECTS)
 	$(LINK) $(@PROGRAM@_OBJECTS) $(@PROGRAM@_LDADD) $(LIBS)
-
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index a7475d202..5c1cd8e2c 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -5,4 +5,3 @@ $(srcdir)/$(CONFIG_HEADER).in: stamp-h.in
 $(srcdir)/stamp-h.in: configure.in $(ACLOCAL) $(ACCONFIG) $(CONFIG_TOP) $(CONFIG_BOT)
 	cd $(srcdir) && autoheader
 	echo timestamp > $(srcdir)/stamp-h.in
-
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 0ea6734ba..382ff82e7 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -10,4 +10,3 @@ uninstall-@DIR@SCRIPTS:
 	for p in $(@DIR@_SCRIPTS); do		\
 	  rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	done
-
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index c835340cf..6d6a666ae 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -20,4 +20,3 @@ maintainer-clean-recursive:
 ## recursive rule.
 	   || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
-
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 0b718ed92..1ef7e447e 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -13,4 +13,3 @@ TAGS:
 ## Make sure we have something to run etags on.
 	test -z "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags" \
 	  || etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS)
-
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index aa4d9e10d..7fb2d5a40 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -32,4 +32,3 @@ uninstall-info:
 	cd $(srcdir) && for file in *.info*; do	\
 	  rm -f $(infodir)/$$file; \
 	done
-