Don't use ${

diff --git a/ChangeLog b/ChangeLog
index 0422de1c745a169d4f956895c8a46ae48240d81f..392f7387d8a089a83e6dcda921400853955f7799 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Tue Dec 12 10:06:28 1995  Tom Tromey  <tromey@cambric.colorado.edu>
 
+       * Makefile.am (maintainer-check): Error if ${...} used.
+       * depend.am (DEP_FILES): Prefer $(...).
+
        * scripts.am (install-@DIR@SCRIPTS): Only install script if it
        exists.
        * libraries.am (install-@DIR@LIBRARIES): Only install library if

diff --git a/Makefile.am b/Makefile.am
index 8b7fc14f3956649d387fda571bae0f94c66ee2cd..aa48a3629b6db7b2ac5babd146966bdfb5d83cbd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ ETAGS_ARGS = automake.in --lang=none \
 # Some simple checks:
 # * syntax check with perl4 and perl5.
 # * make sure the scripts don't use 'true'
+# * expect exactly two instance of '${...}'
 # These are only really guaranteed to work on my machine.
 maintainer-check: automake
        @PERL@ -c -w automake
@@ -34,6 +35,10 @@ maintainer-check: automake
          echo "can't use 'true' in GNU Makefile" 1>&2; \
          exit 1;                               \
        else :; fi
+       if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 2; then \
+         echo "found too many uses of '\$${'" 1>&2; \
+         exit 1;                               \
+       fi
        if test -f /usr/local/bin/perl4.036; then \
          /usr/local/bin/perl4.036 -c -w automake; \
        else :; fi

diff --git a/Makefile.in b/Makefile.in
index 4fbfa01a1708ae8f007e56ef06d9983fa0941be9..4a8ea9a7e7dd1aca672fb92782aff963bfe8c43b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,9 +79,6 @@ SCRIPTS= $(bin_SCRIPTS)
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
-TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg \
-*.toc *.tp *.vr *.op
-
 INFOS = automake.info*
 INFO_DEPS = automake.info
 DVIS = automake.dvi
@@ -296,6 +293,7 @@ maintainer-clean: distclean maintainer-clean-binSCRIPTS maintainer-clean-vti mai
 # Some simple checks:
 # * syntax check with perl4 and perl5.
 # * make sure the scripts don't use 'true'
+# * expect exactly two instance of '${...}'
 # These are only really guaranteed to work on my machine.
 maintainer-check: automake
        @PERL@ -c -w automake
@@ -303,6 +301,10 @@ maintainer-check: automake
          echo "can't use 'true' in GNU Makefile" 1>&2; \
          exit 1;                               \
        else :; fi
+       if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 2; then \
+         echo "found too many uses of '\$${'" 1>&2; \
+         exit 1;                               \
+       fi
        if test -f /usr/local/bin/perl4.036; then \
          /usr/local/bin/perl4.036 -c -w automake; \
        else :; fi

diff --git a/TODO b/TODO
index 72eee6b18000c03a84071903dea25156cfb0816b..4a9aad41eb0d8874581eb3abeb5900554051af2d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,14 @@
 Top priorities:
+* Use info_TEXINFOS
+* Figure out how to handle MANS
 
 
 * am_error should use printf-style arguments (for eventual gettext scheme)
 
 uninstall and pkg-dirs should rm -rf the dir.
 
+Merge dist*.am files into automake itself; replication is bad.
+
 Clean up the output:
 * Order rules sensibly
 * Ensure every line has a purpose.  Omit unused stuff
@@ -14,15 +18,16 @@ Clean up the output:
 
 Need OTHER_SOURCES to hold sources whose objects end up in eg LIBOBJS.
 Dependency tracking should work here.  Maybe if it doesn't exist it
-should be generated automatically by scanning the directory.
+should be generated automatically by scanning the directory.  (yes)
 
 "@kr@" is a hack that should be fixed.  And it should be possible to
 have ansi2knr in just one place in a package.  Jim Meyering says just
 rely on configure to make symlinks as appropriate.  Not sure how I
 feel about this.
 
-Consider automatic support for ".y" files.  At the very least arrange
-to have the corresponding ".c" file be distributed. [last half is done]
+Consider automatic support for ".y" files.
+  [ not right now; it is nice to be able to print the number of
+    expected conflicts, and we can't handle that ]
 
 install-info doesn't have to look in build directory for info files;
 just don't support this mode.
@@ -50,8 +55,6 @@ done)
 
 Rename --include-deps to --insert-deps?
 
-Merge common parts of "dist" targets into dist-local.
-
 It would be good to check some parts of GNU standards.  Already check
 for install-sh and mkinstalldirs.  What else is required to be in
 package by GNU standards or by automake?

diff --git a/depend.am b/depend.am
index 2b89c13bb1bcdad1d925815571be7b331999ad93..d42d5b2143b0b56bc7c8bec8ce5fc7bdebc07480 100644 (file)
--- a/depend.am
+++ b/depend.am
@@ -4,8 +4,8 @@
 
 MKDEP = gcc -MM
 
-## Use ${kr} in case we are doing auto-deANSIfication.
-DEP_FILES = $(patsubst %.${kr}o,.deps/%.P,$(OBJECTS))
+## Use $(kr) in case we are doing auto-deANSIfication.
+DEP_FILES = $(patsubst %.$(kr)o,.deps/%.P,$(OBJECTS))
 
 ## We use ".P" as the name of our placeholder because it can't be
 ## duplicated by any C source file.  (Well, there could be ".c", but

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 8b7fc14f3956649d387fda571bae0f94c66ee2cd..aa48a3629b6db7b2ac5babd146966bdfb5d83cbd 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -27,6 +27,7 @@ ETAGS_ARGS = automake.in --lang=none \
 # Some simple checks:
 # * syntax check with perl4 and perl5.
 # * make sure the scripts don't use 'true'
+# * expect exactly two instance of '${...}'
 # These are only really guaranteed to work on my machine.
 maintainer-check: automake
        @PERL@ -c -w automake
@@ -34,6 +35,10 @@ maintainer-check: automake
          echo "can't use 'true' in GNU Makefile" 1>&2; \
          exit 1;                               \
        else :; fi
+       if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 2; then \
+         echo "found too many uses of '\$${'" 1>&2; \
+         exit 1;                               \
+       fi
        if test -f /usr/local/bin/perl4.036; then \
          /usr/local/bin/perl4.036 -c -w automake; \
        else :; fi

diff --git a/lib/am/depend.am b/lib/am/depend.am
index 2b89c13bb1bcdad1d925815571be7b331999ad93..d42d5b2143b0b56bc7c8bec8ce5fc7bdebc07480 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -4,8 +4,8 @@
 
 MKDEP = gcc -MM
 
-## Use ${kr} in case we are doing auto-deANSIfication.
-DEP_FILES = $(patsubst %.${kr}o,.deps/%.P,$(OBJECTS))
+## Use $(kr) in case we are doing auto-deANSIfication.
+DEP_FILES = $(patsubst %.$(kr)o,.deps/%.P,$(OBJECTS))
 
 ## We use ".P" as the name of our placeholder because it can't be
 ## duplicated by any C source file.  (Well, there could be ".c", but