gnulib added a new syntax-check test: use $(VAR), not @VAR@

The latter is not officially "wrong", but *is* terribly anachronistic.
I think automake documentation or comments call that syntax obsolescent.
* cfg.mk (_makefile_at_at_check_exceptions): Exempt @SCHEMADIR@
and @SYSCONFDIR@ uses -- there are no Makefile variables for those.
* docs/Makefile.am: Use $(INSTALL), not @INSTALL@.
* examples/dominfo/Makefile.am: Similar.
* examples/domsuspend/Makefile.am: Similar.
* proxy/Makefile.am: Similar.
* python/Makefile.am: Similar.
* python/tests/Makefile.am: Similar.
* src/Makefile.am: Similar.
* tests/Makefile.am: Similar.

diff --git a/cfg.mk b/cfg.mk
index 45d6531c94e5916b17ba43eb6b5bb7a7b1eb0669..0f2d2a63d464bae5f8d979c59595e37823dbf5d5 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 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
@@ -265,3 +265,6 @@ ifeq (0,$(MAKELEVEL))
     $(error gnulib update required; run ./autogen.sh first)
   endif
 endif
+
+# Exempt @...@ uses of these symbols.
+_makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/'

diff --git a/docs/Makefile.am b/docs/Makefile.am
index c19e963da370a6af2c5375ddc73553ff343d2c43..eaac62718d6bdb8f18647a503f0f927285e1e614 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -143,7 +143,7 @@ rebuild: api all
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
-       -@INSTALL@ -m 0644 $(srcdir)/FAQ.html \
+       -$(INSTALL) -m 0644 $(srcdir)/FAQ.html \
            $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
        $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
        for h in $(apihtml); do \
@@ -152,7 +152,7 @@ install-data-local:
          $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done
        $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)
        for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
-           @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
+           $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
        done
 
 uninstall-local:

diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am
index a1694b8858e51236db937964f3abd8ba3c7f103e..2913e5b1976ccd2275cc2fc3336e513e21605d25 100644 (file)
--- a/examples/dominfo/Makefile.am
+++ b/examples/dominfo/Makefile.am
@@ -1,6 +1,6 @@
 
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
-LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la       $(COVERAGE_LDFLAGS)
+LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la      $(COVERAGE_LDFLAGS)
 
 noinst_PROGRAMS=info1
 

diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am
index 41e9fdbbbbe4d4482c70e713e8113c78e4ffd97b..14b4205544a6cbf19aa54f96e6d44a291a85794c 100644 (file)
--- a/examples/domsuspend/Makefile.am
+++ b/examples/domsuspend/Makefile.am
@@ -1,6 +1,6 @@
 
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
-LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la       $(COVERAGE_LDFLAGS)
+LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la      $(COVERAGE_LDFLAGS)
 
 noinst_PROGRAMS=suspend
 

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 97d6e5a284768f50e7a9cda3e28bf608ff8126bf..aef11caa39520334900a8e058255434c48282d17 100644 (file)
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
            -I@top_srcdir@/src/util \
            -I@top_srcdir@/src/conf \
            -I@top_srcdir@/src/xen \
-           @LIBXML_CFLAGS@ \
+           $(LIBXML_CFLAGS) \
           -DPROXY  -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
            -DGETTEXT_PACKAGE=\"$(PACKAGE)\" $(WARN_CFLAGS) $(XEN_CFLAGS)
 

diff --git a/python/Makefile.am b/python/Makefile.am
index 58c6729875b19d97c14111d447edf27260f1ea71..6b67e382c653ded2409ec0f18dd1e0b41ddd3f19 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -37,12 +37,12 @@ pyexec_LTLIBRARIES = libvirtmod.la
 libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h
 # Python <= 2.4 header files contain a redundant decl, hence we
 # need extra flags here
-libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@
+libvirtmod_la_CFLAGS = $(WARN_PYTHON_CFLAGS)
 
 libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \
-       @CYGWIN_EXTRA_LDFLAGS@
+       $(CYGWIN_EXTRA_LDFLAGS)
 libvirtmod_la_LIBADD = $(mylibs) \
-       @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@
+       $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD)
 
 GENERATE = generator.py
 API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-override-api.xml
@@ -61,10 +61,10 @@ $(libvirtmod_la_OBJECTS): $(GENERATED)
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(pyexecdir)
-       @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pyexecdir)
+       $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir)
        $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
        @(for doc in $(DOCS) ; \
-          do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
+          do $(INSTALL) -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
 
 uninstall-local:
        rm -f $(DESTDIR)$(pyexecdir)/libvirt.py

diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index 6011fef08ee6beb4e68d1768609ef722dd71b045..28e24ba4cd0ca8a02a73945a2fd88c4e542df018 100644 (file)
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -30,7 +30,7 @@ clean:
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR)
        -(for test in $(PYTESTS); \
-         do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
+         do $(INSTALL) -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
 
 uninstall-local:
        for test in $(PYTESTS); do rm -f $(DESTDIR)$(EXAMPLE_DIR)/$$test; done

diff --git a/src/Makefile.am b/src/Makefile.am
index 49946afb0ba1edb638ad8ec97bf5bc2809f94769..713cbda35c55a6d60a2321b33a06f3d0d8f50946 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -806,13 +806,13 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES)
 # Empty source list - it merely links a bunch of convenience libs together
 libvirt_la_SOURCES =
 libvirt_la_LIBADD += \
-                   @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la
+                   $(CYGWIN_EXTRA_LIBADD) ../gnulib/lib/libgnu.la
 libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \
-                     -version-info @LIBVIRT_VERSION_INFO@ \
+                     -version-info $(LIBVIRT_VERSION_INFO) \
                     $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \
                     $(LIBXML_LIBS) \
                    $(DRIVER_MODULE_LIBS) \
-                   @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@
+                   $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS)
 libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT
 libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms
 
@@ -824,8 +824,8 @@ noinst_LTLIBRARIES += libvirt_test.la
 # Remove version script from convenience library
 test_LDFLAGS =                                         \
   $$(echo '$(libvirt_la_LDFLAGS)'                      \
-     |sed 's!@VERSION_SCRIPT_FLAGS@libvirt.syms!!'     \
-     |sed 's!-version-info @LIBVIRT_VERSION_INFO@!!')
+     |sed 's!$(VERSION_SCRIPT_FLAGS)libvirt.syms!!'    \
+     |sed 's!-version-info $(LIBVIRT_VERSION_INFO)!!')
 
 # Just like the above, but with a slightly different set of public symbols.
 libvirt_test_la_SOURCES = $(libvirt_la_SOURCES)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a20d7ce10e0b0b334e2371634218ddb915713751..584bdb3d52b69fccf53306296369d2d17d966e5d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES += \
 endif
 
 LDADDS = \
-       @STATIC_BINARIES@ \
+       $(STATIC_BINARIES) \
        $(LIBXML_LIBS) \
         $(GNUTLS_LIBS) \
         $(SASL_LIBS) \