Appease gnulib sc_makefile_at_at_check

This is for v0.9.6 maint only, though similar changes are upstream.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 690bf851aa46bba0a5de90ad05604a35c63e60ec..49d7ee8806d3834b5a5c054166994ecaba3bb51c 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -267,9 +267,9 @@ BUILT_SOURCES += libvirtd.init
 
 libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
        $(AM_V_GEN)sed                                  \
-           -e s!\@localstatedir\@!@localstatedir@!g    \
-           -e s!\@sbindir\@!@sbindir@!g                \
-           -e s!\@sysconfdir\@!@sysconfdir@!g          \
+           -e s!\@localstatedir\@!$(localstatedir)!g   \
+           -e s!\@sbindir\@!$(sbindir)!g               \
+           -e s!\@sysconfdir\@!$(sysconfdir)!g         \
            < $< > $@-t &&                              \
            chmod a+x $@-t &&                           \
            mv $@-t $@

diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am
index 07982b0aa7098a84bdc0d96567845ffd1a3ae296..bde33e1a0266fe360ba30c74e68b29e73abcac42 100644 (file)
--- a/examples/dominfo/Makefile.am
+++ b/examples/dominfo/Makefile.am
@@ -1,7 +1,7 @@
 ## Copyright (C) 2005-2011 Red Hat, Inc.
 ## See COPYING.LIB for the License of this software
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
 LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \
        $(COVERAGE_LDFLAGS)
 

diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am
index fc5e9319a80f333a6fafe815124714e2f6d993e4..baa3cf58828c1f1df8b4fedd849f7889628b2bf3 100644 (file)
--- a/examples/domsuspend/Makefile.am
+++ b/examples/domsuspend/Makefile.am
@@ -1,7 +1,7 @@
 ## Copyright (C) 2005-2011 Red Hat, Inc.
 ## See COPYING.LIB for the License of this software
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
 LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \
        $(COVERAGE_LDFLAGS)
 

diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am
index a55fe191a8877bd4471395b3bd39f4c5785ed302..9f67eff7d7b161e9b22477ec41f4f942abe491bd 100644 (file)
--- a/examples/hellolibvirt/Makefile.am
+++ b/examples/hellolibvirt/Makefile.am
@@ -5,4 +5,4 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = hellolibvirt
 hellolibvirt_CFLAGS = $(WARN_CFLAGS)
 hellolibvirt_SOURCES = hellolibvirt.c
-hellolibvirt_LDADD = @top_builddir@/src/libvirt.la
+hellolibvirt_LDADD = $(top_builddir)/src/libvirt.la

diff --git a/examples/openauth/Makefile.am b/examples/openauth/Makefile.am
index 844b572804c7cb7c4a578c917681609310f3edc9..3d2c9961adfe2cf75049e8e724d3709caff6697b 100644 (file)
--- a/examples/openauth/Makefile.am
+++ b/examples/openauth/Makefile.am
@@ -5,4 +5,4 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = openauth
 openauth_CFLAGS = $(WARN_CFLAGS)
 openauth_SOURCES = openauth.c
-openauth_LDADD = @top_builddir@/src/libvirt.la
+openauth_LDADD = $(top_builddir)/src/libvirt.la

diff --git a/src/Makefile.am b/src/Makefile.am
index c0b4d5d041bf3116fea4efaec2c118123c974fe3..84bba493aac8b9963e5b6a42d59100a9432e947e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,8 @@
 INCLUDES =     -I$(top_srcdir)/gnulib/lib                      \
                -I../gnulib/lib                                 \
                -I../include                                    \
-               -I@top_srcdir@/src/util                         \
-               -I@top_srcdir@/include                          \
+               -I$(top_srcdir)/src/util                                \
+               -I$(top_srcdir)/include                         \
                -DIN_LIBVIRT                                    \
                $(GETTEXT_CPPFLAGS)
 
@@ -559,14 +559,14 @@ libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS)
 noinst_LTLIBRARIES += libvirt_cpu.la
 libvirt_la_BUILT_LIBADD += libvirt_cpu.la
 libvirt_cpu_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
 
 if WITH_VMX
 noinst_LTLIBRARIES += libvirt_vmx.la
 libvirt_la_BUILT_LIBADD += libvirt_vmx.la
 libvirt_vmx_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
 endif
 
@@ -574,7 +574,7 @@ if WITH_XENXS
 noinst_LTLIBRARIES += libvirt_xenxs.la
 libvirt_la_BUILT_LIBADD += libvirt_xenxs.la
 libvirt_xenxs_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES)
 endif
 
@@ -584,7 +584,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver.la
 libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
 
 libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS)
 
 USED_SYM_FILES = libvirt_private.syms
@@ -597,7 +597,7 @@ noinst_LTLIBRARIES += libvirt_driver_test.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
 endif
 libvirt_driver_test_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 if WITH_DRIVER_MODULES
 libvirt_driver_test_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
 endif
@@ -614,8 +614,8 @@ endif
 libvirt_driver_remote_la_CFLAGS =                              \
                $(GNUTLS_CFLAGS)                                \
                $(XDR_CFLAGS)                                   \
-               -I@top_srcdir@/src/conf                         \
-               -I@top_srcdir@/src/rpc                          \
+               -I$(top_srcdir)/src/conf                                \
+               -I$(top_srcdir)/src/rpc                         \
                $(AM_CFLAGS)
 libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_remote_la_LIBADD = $(GNUTLS_LIBS) libvirt-net-rpc-client.la libvirt-net-rpc.la
@@ -647,8 +647,8 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la
 endif
 libvirt_driver_xen_la_CFLAGS =                                 \
                $(XEN_CFLAGS)                                   \
-               -I@top_srcdir@/src/conf                         \
-               -I@top_srcdir@/src/xenxs                        \
+               -I$(top_srcdir)/src/conf                                \
+               -I$(top_srcdir)/src/xenxs                       \
                $(AM_CFLAGS)
 libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_xen_la_LIBADD = $(XEN_LIBS)
@@ -672,7 +672,7 @@ libvirt_driver_phyp_la_LIBADD += ../gnulib/lib/libgnu.la
 libvirt_driver_phyp_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
 endif
 libvirt_driver_phyp_la_CFLAGS = $(LIBSSH2_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
 endif
 
@@ -684,7 +684,7 @@ noinst_LTLIBRARIES += libvirt_driver_openvz.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
 endif
 libvirt_driver_openvz_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 if WITH_DRIVER_MODULES
 libvirt_driver_openvz_la_LIBADD = ../gnulib/lib/libgnu.la
 libvirt_driver_openvz_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
@@ -700,7 +700,7 @@ noinst_LTLIBRARIES += libvirt_driver_vmware.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
 endif
 libvirt_driver_vmware_la_CFLAGS = \
-               -I@top_srcdir@/src/conf -I@top_srcdir@/src/vmx $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
 if WITH_DRIVER_MODULES
 libvirt_driver_vmware_la_LIBADD = ../gnulib/lib/libgnu.la
 libvirt_driver_vmware_la_LDFLAGS = -module -avoid-version
@@ -716,7 +716,7 @@ noinst_LTLIBRARIES += libvirt_driver_vbox.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la
 endif
 libvirt_driver_vbox_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_vbox_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS)
 if WITH_DRIVER_MODULES
 libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la
@@ -733,7 +733,7 @@ noinst_LTLIBRARIES += libvirt_driver_xenapi.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
 endif
 libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(LIBCURL_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(LIBCURL_LIBS)
 if WITH_DRIVER_MODULES
@@ -752,8 +752,8 @@ noinst_LTLIBRARIES += libvirt_driver_libxl.la
 #libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la
 endif
 libvirt_driver_libxl_la_CFLAGS = $(LIBXL_CFLAGS)               \
-               -I@top_srcdir@/src/conf                         \
-               -I@top_srcdir@/src/xenxs                        \
+               -I$(top_srcdir)/src/conf                                \
+               -I$(top_srcdir)/src/xenxs                       \
                $(AM_CFLAGS)
 libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_libxl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la
@@ -773,7 +773,7 @@ noinst_LTLIBRARIES += libvirt_driver_qemu.la
 #libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la
 endif
 libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_qemu_la_LIBADD = $(NUMACTL_LIBS) \
                                $(CAPNG_LIBS)
@@ -802,7 +802,7 @@ noinst_LTLIBRARIES += libvirt_driver_lxc.la
 #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la
 endif
 libvirt_driver_lxc_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS)
 if WITH_SECDRIVER_SELINUX
 libvirt_driver_lxc_la_LIBADD += $(SELINUX_LIBS)
@@ -833,7 +833,7 @@ noinst_LTLIBRARIES += libvirt_driver_uml.la
 #libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la
 endif
 libvirt_driver_uml_la_CFLAGS = $(NUMACTL_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_uml_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_uml_la_LIBADD = $(NUMACTL_LIBS)
 if WITH_DRIVER_MODULES
@@ -858,7 +858,7 @@ noinst_LTLIBRARIES += libvirt_driver_esx.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
 endif
 libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \
-               -I@top_srcdir@/src/conf -I@top_srcdir@/src/vmx $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
 libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_esx_la_LIBADD = $(LIBCURL_LIBS)
 if WITH_DRIVER_MODULES
@@ -884,7 +884,7 @@ noinst_LTLIBRARIES += libvirt_driver_hyperv.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_hyperv.la
 endif
 libvirt_driver_hyperv_la_CFLAGS = $(OPENWSMAN_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
 if WITH_DRIVER_MODULES
@@ -903,7 +903,7 @@ noinst_LTLIBRARIES += libvirt_driver_network.la
 #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la
 endif
 libvirt_driver_network_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 if WITH_DRIVER_MODULES
 libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la
 libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
@@ -923,7 +923,7 @@ noinst_LTLIBRARIES += libvirt_driver_interface.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la
 endif
 libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_interface_la_LIBADD = $(NETCF_LIBS)
 if WITH_DRIVER_MODULES
@@ -942,7 +942,7 @@ noinst_LTLIBRARIES += libvirt_driver_secret.la
 #libvirt_la_BUILT_LIBADD += libvirt_driver_secret.la
 endif
 libvirt_driver_secret_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 if WITH_DRIVER_MODULES
 libvirt_driver_secret_la_LIBADD = ../gnulib/lib/libgnu.la
 libvirt_driver_secret_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
@@ -953,7 +953,7 @@ endif
 # Needed to keep automake quiet about conditionals
 libvirt_driver_storage_la_SOURCES =
 libvirt_driver_storage_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_storage_la_LIBADD =
 if WITH_SECDRIVER_SELINUX
@@ -1016,7 +1016,7 @@ endif
 libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
 
 libvirt_driver_nodedev_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_nodedev_la_LIBADD =       \
                libvirt_util.la          \
@@ -1048,7 +1048,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la
 noinst_LTLIBRARIES += libvirt_driver_nwfilter.la
 endif
 libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS)
 libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS)
 if WITH_DRIVER_MODULES
@@ -1063,7 +1063,7 @@ libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
 noinst_LTLIBRARIES += libvirt_driver_security.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_security.la
 libvirt_driver_security_la_CFLAGS = \
-               -I@top_srcdir@/src/conf $(AM_CFLAGS)
+               -I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_security_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_security_la_LIBADD =
 if WITH_SECDRIVER_SELINUX
@@ -1445,7 +1445,7 @@ libvirt_lxc_CFLAGS =                              \
                $(CAPNG_CFLAGS)                 \
                $(YAJL_CFLAGS)                  \
                $(AUDIT_CFLAGS)                 \
-               -I@top_srcdir@/src/conf         \
+               -I$(top_srcdir)/src/conf                \
                $(AM_CFLAGS)
 endif
 endif
@@ -1464,8 +1464,8 @@ virt_aa_helper_LDADD =                                            \
                libvirt_util.la                                 \
                ../gnulib/lib/libgnu.la
 virt_aa_helper_CFLAGS =                                                \
-               -I@top_srcdir@/src/conf                         \
-               -I@top_srcdir@/src/security                     \
+               -I$(top_srcdir)/src/conf                                \
+               -I$(top_srcdir)/src/security                    \
                $(AM_CFLAGS)
 endif
 endif