[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



Updating to newer gnulib also pulled in a new sytnax-check
test that evoked new warnings.  No big deal, but I addressed them.
The only trick was to see that the warnings about @SCHEMADIR@
and @SYSCONFDIR@ were false positives.  To allow them, I defined
the variable in cfg.mk.  See below.

>From 6e76cfe38ba0ccafa7c4e81dcc0af04e31f8f447 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Fri, 15 Jan 2010 11:09:01 +0100
Subject: [PATCH] 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.
---
 cfg.mk                          |    5 ++++-
 docs/Makefile.am                |    4 ++--
 examples/dominfo/Makefile.am    |    2 +-
 examples/domsuspend/Makefile.am |    2 +-
 proxy/Makefile.am               |    2 +-
 python/Makefile.am              |   10 +++++-----
 python/tests/Makefile.am        |    2 +-
 src/Makefile.am                 |   10 +++++-----
 tests/Makefile.am               |    2 +-
 9 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 45d6531..0f2d2a6 100644
--- 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 c19e963..eaac627 100644
--- 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 a1694b8..2913e5b 100644
--- 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 41e9fdb..14b4205 100644
--- 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 97d6e5a..aef11ca 100644
--- 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 58c6729..6b67e38 100644
--- 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 6011fef..28e24ba 100644
--- 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 324030b..af97938 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -800,13 +800,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

@@ -818,8 +818,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 a20d7ce..584bdb3 100644
--- 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) \
--
1.6.6.556.gd6679


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]