automake: Admit defeat and use 'subdir-objects'.

Because this 'feature' is broken (since 2013):

  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928

we have to replace all instances of $(top_srcdir) in *_SOURCES lines
with a relative path.  According to what I read, this shouldn't break
split builds, but I didn't test it.

The only things automake moans about now are:

* Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\${ <-- HERE ([^ \t=:+{}]+)}/ at /usr/bin/automake line 3936.

  - This is another bug in automake

* autoreconf: configure.ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION

  - This is a feature, not a bug.
This commit is contained in:
Richard W.M. Jones
2015-08-04 19:54:02 +01:00
parent f3ed65525c
commit 91c06391c1
12 changed files with 34 additions and 33 deletions

View File

@@ -27,8 +27,8 @@ check_PROGRAMS = $(TESTS)
test_parallel_mount_local_SOURCES = \
test-parallel-mount-local.c \
$(top_srcdir)/df/estimate-max-threads.c \
$(top_srcdir)/df/estimate-max-threads.h
../../df/estimate-max-threads.c \
../../df/estimate-max-threads.h
test_parallel_mount_local_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \