[PATCH 09/25] syntax-check: fix violations and re-enable sc_makefile_at_at_check.

[Gary V. Vaughan]

* cfg.mk (local-checks-to-fix): Remove sc_makefile_at_at_check from list
of disabled checks.
* configure.ac (order-only prerequisites): Test with the order-only pipe
symbol in a macro.
* Makefile.am, tests/mdemo/Makefile.am: Convert all @FOO@ to $(FOO).

Signed-off-by: Gary V. Vaughan <address@hidden>
---
 Makefile.am             |   42 +++++++++++++++++++++---------------------
 cfg.mk                  |    1 -
 configure.ac            |    3 ++-
 tests/mdemo/Makefile.am |   12 ++++++------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b559b5e..97de896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -325,7 +325,7 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
 
 .PHONY: configure-subdirs
 configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
address@hidden@:
+$(DIST_MAKEFILE_LIST):
        $(AM_V_at)dir=`echo '$@' |'$(SED)' 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
        test -d "$$dir" || mkdir "$$dir" || exit 1; \
        abs_srcdir=`$(lt__cd) '$(srcdir)' && pwd`; \
@@ -417,7 +417,7 @@ EXTRA_DIST  += $(doc_dir)/gendocs_template
 #   info_TEXINFOS      = $(doc_dir)/libtool.texi
 #
 # Producing the following error, even though srcdir is implicitly set:
-# "cannot open < ./@srcdir@/doc/libtool.texi: No such file or directory"
+# "cannot open < ./$(srcdir)/doc/libtool.texi: No such file or directory"
 info_TEXINFOS          = doc/libtool.texi
 doc_libtool_TEXINFOS   = $(doc_dir)/PLATFORMS $(doc_dir)/fdl.texi \
                          $(notes_texi)
@@ -726,12 +726,12 @@ $(testsuite): $(package_m4) $(TESTSUITE_AT) Makefile.am
 $(package_m4): $(dotversion) Makefile.am
        $(AM_V_GEN){ \
          echo '# Signature of the current package.'; \
-         echo 'm4_define([AT_PACKAGE_NAME],      address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_TARNAME],   address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_VERSION],   address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_STRING],    address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_URL],       address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
+         echo 'm4_define([AT_PACKAGE_URL],       [$(PACKAGE_URL)])'; \
        } > '$@'
 
 tests/atconfig: $(config_status)
@@ -966,13 +966,13 @@ INTERACTIVE_TESTS = \
 
 tests/cdemo-undef-exec.log:    tests/cdemo-undef-make.log
 tests/cdemo-undef-make.log:    tests/cdemo-undef.log
-tests/cdemo-undef.log: @ORDER@ tests/cdemo-shared-exec.log
+tests/cdemo-undef.log: $(ORDER)        tests/cdemo-shared-exec.log
 tests/cdemo-shared-exec.log:   tests/cdemo-shared-make.log
 tests/cdemo-shared-make.log:   tests/cdemo-shared.log
-tests/cdemo-shared.log: @ORDER@        tests/cdemo-exec.log
+tests/cdemo-shared.log: $(ORDER) tests/cdemo-exec.log
 tests/cdemo-exec.log:          tests/cdemo-make.log
 tests/cdemo-make.log:          tests/cdemo-conf.log
-tests/cdemo-conf.log: @ORDER@  tests/cdemo-static-exec.log
+tests/cdemo-conf.log: $(ORDER) tests/cdemo-static-exec.log
 tests/cdemo-static-exec.log:   tests/cdemo-static-make.log
 tests/cdemo-static-make.log:   tests/cdemo-static.log
 
@@ -983,24 +983,24 @@ tests/demo-hardcode.log:  tests/demo-shared-inst.log
 tests/demo-shared-inst.log:    tests/demo-shared-exec.log
 tests/demo-shared-exec.log:    tests/demo-shared-make.log
 tests/demo-shared-make.log:    tests/demo-shared.log
-tests/demo-shared.log: @ORDER@ tests/demo-nopic-exec.log
+tests/demo-shared.log: $(ORDER)        tests/demo-nopic-exec.log
 tests/demo-nopic-exec.log:     tests/demo-nopic-make.log
 tests/demo-nopic-make.log:     tests/demo-nopic.log
-tests/demo-nopic.log: @ORDER@  tests/demo-pic-exec.log
+tests/demo-nopic.log: $(ORDER) tests/demo-pic-exec.log
 tests/demo-pic-exec.log:       tests/demo-pic-make.log
 tests/demo-pic-make.log:       tests/demo-pic.log
-tests/demo-pic.log: @ORDER@    tests/demo-nofast-unst.log
+tests/demo-pic.log: $(ORDER)   tests/demo-nofast-unst.log
 tests/demo-nofast-unst.log:    tests/demo-nofast-inst.log
 tests/demo-nofast-inst.log:    tests/demo-nofast-exec.log
 tests/demo-nofast-exec.log:    tests/demo-nofast-make.log
 tests/demo-nofast-make.log:    tests/demo-nofast.log
-tests/demo-nofast.log: @ORDER@ tests/demo-deplibs.log
+tests/demo-nofast.log: $(ORDER)        tests/demo-deplibs.log
 tests/demo-deplibs.log:                tests/demo-unst.log
 tests/demo-unst.log:           tests/demo-inst.log
 tests/demo-inst.log:           tests/demo-exec.log
 tests/demo-exec.log:           tests/demo-make.log
 tests/demo-make.log:           tests/demo-conf.log
-tests/demo-conf.log: @ORDER@   tests/demo-static-unst.log
+tests/demo-conf.log: $(ORDER)  tests/demo-static-unst.log
 tests/demo-static-unst.log:    tests/demo-static-inst.log
 tests/demo-static-inst.log:    tests/demo-static-exec.log
 tests/demo-static-exec.log:    tests/demo-static-make.log
@@ -1011,17 +1011,17 @@ tests/depdemo-relink.log:       
tests/depdemo-shared-inst.log
 tests/depdemo-shared-inst.log: tests/depdemo-shared-exec.log
 tests/depdemo-shared-exec.log: tests/depdemo-shared-make.log
 tests/depdemo-shared-make.log: tests/depdemo-shared.log
-tests/depdemo-shared.log: @ORDER@ tests/depdemo-nofast-unst.log
+tests/depdemo-shared.log: $(ORDER) tests/depdemo-nofast-unst.log
 tests/depdemo-nofast-unst.log: tests/depdemo-nofast-inst.log
 tests/depdemo-nofast-inst.log: tests/depdemo-nofast-exec.log
 tests/depdemo-nofast-exec.log: tests/depdemo-nofast-make.log
 tests/depdemo-nofast-make.log: tests/depdemo-nofast.log
-tests/depdemo-nofast.log: @ORDER@ tests/depdemo-unst.log
+tests/depdemo-nofast.log: $(ORDER) tests/depdemo-unst.log
 tests/depdemo-unst.log:                tests/depdemo-inst.log
 tests/depdemo-inst.log:                tests/depdemo-exec.log
 tests/depdemo-exec.log:                tests/depdemo-make.log
 tests/depdemo-make.log:                tests/depdemo-conf.log
-tests/depdemo-conf.log: @ORDER@        tests/depdemo-static-unst.log
+tests/depdemo-conf.log: $(ORDER) tests/depdemo-static-unst.log
 tests/depdemo-static-unst.log: tests/depdemo-static-inst.log
 tests/depdemo-static-inst.log: tests/depdemo-static-exec.log
 tests/depdemo-static-exec.log: tests/depdemo-static-make.log
@@ -1031,7 +1031,7 @@ tests/mdemo-shared-unst.log:      
tests/mdemo-shared-inst.log
 tests/mdemo-shared-inst.log:   tests/mdemo-shared-exec.log
 tests/mdemo-shared-exec.log:   tests/mdemo-shared-make.log
 tests/mdemo-shared-make.log:   tests/mdemo-shared.log
-tests/mdemo-shared.log: @ORDER@        tests/mdemo-dryrun.log \
+tests/mdemo-shared.log: $(ORDER) tests/mdemo-dryrun.log \
                                tests/mdemo2-exec.log
 
 tests/mdemo-dryrun.log:                tests/mdemo-unst.log
@@ -1039,7 +1039,7 @@ tests/mdemo-unst.log:             tests/mdemo-inst.log
 tests/mdemo-inst.log:          tests/mdemo-exec.log
 tests/mdemo-exec.log:          tests/mdemo-make.log
 tests/mdemo-make.log:          tests/mdemo-conf.log
-tests/mdemo-conf.log: @ORDER@  tests/mdemo-static-unst.log
+tests/mdemo-conf.log: $(ORDER) tests/mdemo-static-unst.log
 tests/mdemo-static-unst.log:   tests/mdemo-static-inst.log
 tests/mdemo-static-inst.log:   tests/mdemo-static-exec.log
 tests/mdemo-static-exec.log:   tests/mdemo-static-make.log
diff --git a/cfg.mk b/cfg.mk
index 4fb2b37..0acc4b1 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -38,7 +38,6 @@ endif
 VC_LIST_ALWAYS_EXCLUDE_REGEX = ^mail/
 
 local-checks-to-fix =                          \
-       sc_makefile_at_at_check                 \
        sc_prohibit_always-defined_macros       \
        sc_prohibit_always_true_header_tests    \
        sc_prohibit_cvs_keyword                 \
diff --git a/configure.ac b/configure.ac
index 7783e07..5c07723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,7 +186,8 @@ AC_CACHE_CHECK([whether ${MAKE-make} supports order-only 
prerequisites],
    touch b
    touch a
 cat >confmk << 'END'
-a: b | c
+ORDER = |
+a: b $(ORDER) c
 a b c:
        touch $[]@
 END
diff --git a/tests/mdemo/Makefile.am b/tests/mdemo/Makefile.am
index a0ab490..89b7224 100644
--- a/tests/mdemo/Makefile.am
+++ b/tests/mdemo/Makefile.am
@@ -43,18 +43,18 @@ libsub_la_LDFLAGS = -no-undefined
 ## its exported symbols, and we use libltdl as a convenience archive.
 ## Thus, on w32, auto-exporting is turned off.
 libmlib_la_SOURCES = mlib.c
-libmlib_la_LIBADD = @LIBLTDL@ "-dlopen" foo1.la "-dlopen" libfoo2.la
+libmlib_la_LIBADD = $(LIBLTDL) "-dlopen" foo1.la "-dlopen" libfoo2.la
 libmlib_la_LDFLAGS = -no-undefined -export-symbols-regex ".*"
-libmlib_la_DEPENDENCIES = @LIBLTDL@ libsub.la foo1.la libfoo2.la
+libmlib_la_DEPENDENCIES = $(LIBLTDL) libsub.la foo1.la libfoo2.la
 
 noinst_HEADERS = foo.h
 
 bin_PROGRAMS = mdemo mdemo_static
 
-## use @LIBLTDL@ because some broken makes do not accept macros in targets
+## use $(LIBLTDL) because some broken makes do not accept macros in targets
 ## we can only do this because our LIBLTDL does not contain ${top_builddir}
 top_distdir = ../..
address@hidden@: $(top_distdir)/libtool \
+$(LIBLTDL): $(top_distdir)/libtool \
     $(top_distdir)/config.h $(srcdir)/$(top_distdir)/libltdl/ltdl.c \
     $(srcdir)/$(top_distdir)/libltdl/ltdl.h
        (cd $(top_distdir); $(MAKE) `echo $(LIBLTDL) | sed 
's,.*\.\./libltdl/,libltdl/,g'`)
@@ -65,9 +65,9 @@ $(top_distdir)/config.h:
 mdemo_SOURCES = main.c
 mdemo_LDFLAGS = -export-dynamic
 ## The quotes around -dlopen below fool automake into accepting it
-mdemo_LDADD = @LIBLTDL@ libsub.la "-dlopen" self \
+mdemo_LDADD = $(LIBLTDL) libsub.la "-dlopen" self \
                "-dlopen" foo1.la "-dlopen" libfoo2.la
-mdemo_DEPENDENCIES = @LIBLTDL@ libsub.la foo1.la libfoo2.la
+mdemo_DEPENDENCIES = $(LIBLTDL) libsub.la foo1.la libfoo2.la
 
 # Create a statically linked version of mdemo.
 mdemo_static_SOURCES = $(mdemo_SOURCES)
-- 
1.7.7.3

Cheers,
-- 
Gary V. Vaughan (gary AT gnu DOT org)