Distinguish automake substitutions from config.status

substitutions.
* automake.in (&add_depend2): Transform AMDEP.
(&handle_clean): Transform MCFILES and MFILES.
(&file_contents): Transform MAINTAINER_MODE.
(&transform, &am_install_var): Use `%', not `@'.
Adjust all the *.am files.
* clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN.
* depend2.am: Display the double dependency on both ?AMDEP? and
@AMDEP@.

1 files changed, 18 insertions, 16 deletions

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 6252f9bb1..7945c22df 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,5 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001
+## 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
@@ -15,40 +16,41 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-@CONFIG_HEADER@: @STAMP@
+%CONFIG_HEADER%: %STAMP%
 ## Recover from removal of CONFIG_HEADER
 	@if test ! -f $@; then \
-		rm -f @STAMP@; \
-		$(MAKE) @STAMP@; \
+		rm -f %STAMP%; \
+		$(MAKE) %STAMP%; \
 	else :; fi
 ## Explicitly look in srcdir for benefit of non-GNU makes.
-@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status
-	@rm -f @STAMP@ @STAMP@T
+%STAMP%: $(srcdir)/%CONFIG_HEADER_IN% $(top_builddir)/config.status
+	@rm -f %STAMP% %STAMP%T
 ## We used to try to get a real timestamp here.  But the fear is that
 ## that will cause unnecessary cvs conflicts
-	@echo timestamp > @STAMP@T 2> /dev/null
+	@echo timestamp > %STAMP%T 2> /dev/null
 	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \
+	  && CONFIG_FILES= CONFIG_HEADERS=%CONFIG_HEADER_FULL% \
 	     $(SHELL) ./config.status
 ## Creating the timestamp first, and moving it later, helps ensure that
 ## it will be older than the header file, avoiding needless triggering
 ## of the rebuild rule.
-	@mv @STAMP@T @STAMP@
+	@mv %STAMP%T %STAMP%
 ## Explicitly look in srcdir for benefit of non-GNU makes.
 ## SRC_STAMP takes into account a possible subdir where CONFIG_HEADER_IN is
-$(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@SRC_STAMP@.in
+?MAINTAINER_MODE?$(srcdir)/%CONFIG_HEADER_IN%: @MAINTAINER_MODE_TRUE@$(srcdir)/%SRC_STAMP%.in
+?!MAINTAINER_MODE?$(srcdir)/%CONFIG_HEADER_IN%: $(srcdir)/%SRC_STAMP%.in
 ## Recover from removal of CONFIG_HEADER_IN
 	@if test ! -f $@; then \
-		rm -f $(srcdir)/@SRC_STAMP@.in; \
-		$(MAKE) $(srcdir)/@SRC_STAMP@.in; \
+		rm -f $(srcdir)/%SRC_STAMP%.in; \
+		$(MAKE) $(srcdir)/%SRC_STAMP%.in; \
 	else :; fi
-$(srcdir)/@SRC_STAMP@.in: $(top_srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) @FILES@
-	@rm -f $(srcdir)/@SRC_STAMP@.in $(srcdir)/@SRC_STAMP@.inT
+$(srcdir)/%SRC_STAMP%.in: $(top_srcdir)/%CONFIGURE_AC% $(ACLOCAL_M4) %FILES%
+	@rm -f $(srcdir)/%SRC_STAMP%.in $(srcdir)/%SRC_STAMP%.inT
 ## We used to try to get a real timestamp here.  But the fear is that
 ## that will cause unnecessary cvs conflicts
-	@echo timestamp > $(srcdir)/@SRC_STAMP@.inT 2> /dev/null
+	@echo timestamp > $(srcdir)/%SRC_STAMP%.inT 2> /dev/null
 	cd $(top_srcdir) && $(AUTOHEADER)
 ## Creating the timestamp first, and moving it later, helps ensure that
 ## it will be older than the header file, avoiding needless triggering
 ## of the rebuild rule.
-	@mv $(srcdir)/@SRC_STAMP@.inT $(srcdir)/@SRC_STAMP@.in
+	@mv $(srcdir)/%SRC_STAMP%.inT $(srcdir)/%SRC_STAMP%.in