Apparently this was necessary in the past because old versions
of autoconf/automake didn't make them available, but these
days all of the platforms we target include recent enough
autotools - as evidenced by the fact that, for example, we
already use abs_top_srcdir in tools/ despite the fact that
tools/Makefile.am is missing the same boilerplate.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/Makefile.am   | 6 ------
 tests/Makefile.am | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d3d231889..4294bd1c6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,12 +16,6 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-# old automake does not provide abs_{src,build}dir variables
-abs_builddir = $(shell pwd)
-abs_top_builddir = $(shell cd .. && pwd)
-abs_srcdir = $(shell cd $(srcdir) && pwd)
-abs_top_srcdir = $(shell cd $(top_srcdir) && pwd)
-
 # No libraries with the exception of LIBXML should be listed
 # here. List them against the individual XXX_la_CFLAGS targets
 # that actually use them.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 858ed047e8..7ce327c9e8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,12 +16,6 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-# old automake does not provide abs_{src,build}dir variables
-abs_builddir = $(shell pwd)
-abs_top_builddir = $(shell cd .. && pwd)
-abs_srcdir = $(shell cd $(srcdir) && pwd)
-abs_top_srcdir = $(shell cd $(top_srcdir) && pwd)
-
 SHELL = $(PREFERABLY_POSIX_SHELL)
 
 AM_CPPFLAGS = \
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Wed, Mar 13, 2019 at 05:51:23PM +0100, Andrea Bolognani wrote:
>Apparently this was necessary in the past because old versions
>of autoconf/automake didn't make them available, but these
>days all of the platforms we target include recent enough
>autotools - as evidenced by the fact that, for example, we
>already use abs_top_srcdir in tools/ despite the fact that
>tools/Makefile.am is missing the same boilerplate.
>

Although it's used there only if building wireshark dissector, which less people
are building, IMHO.

>Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Thu, 2019-03-14 at 09:45 +0100, Martin Kletzander wrote:
> On Wed, Mar 13, 2019 at 05:51:23PM +0100, Andrea Bolognani wrote:
> > Apparently this was necessary in the past because old versions
> > of autoconf/automake didn't make them available, but these
> > days all of the platforms we target include recent enough
> > autotools - as evidenced by the fact that, for example, we
> > already use abs_top_srcdir in tools/ despite the fact that
> > tools/Makefile.am is missing the same boilerplate.
> 
> Although it's used there only if building wireshark dissector, which less people
> are building, IMHO.

Fair point :)

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On 3/13/19 11:51 AM, Andrea Bolognani wrote:
> Apparently this was necessary in the past because old versions
> of autoconf/automake didn't make them available, but these
> days all of the platforms we target include recent enough
> autotools - as evidenced by the fact that, for example, we
> already use abs_top_srcdir in tools/ despite the fact that
> tools/Makefile.am is missing the same boilerplate.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/Makefile.am   | 6 ------
>  tests/Makefile.am | 6 ------
>  2 files changed, 12 deletions(-)

Commit 9aef4d96 states that it was automake from RHEL 5 that caused the
grief; as we no longer support that platform, we no longer have to
maintain the back-compat hacks.

The next back-compat hack to get rid of: we should stop using INCLUDES
in Makefile.am, and instead spell it CPPFLAGS. INCLUDES was necessary
for automake 1.9.6 (see commit 6ae3052c), but modern automake says it is
outdated.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list