configure.ac: Add subdir-objects to AM_INIT_AUTOMAKE paramaters

Silences a warning when running autogen.sh.

This also adds a work-around for a bug in automake
<https://lists.gnu.org/archive/html/bug-automake/2014-01/msg00005.html>
replacing $(top_srcdir) with ../ in test/Makefile.am.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>

diff --git a/configure.ac b/configure.ac
index 65c915e68c15b38a3f9c6a4d8e7b6c07e6b9ab09..fd402e20f49ac2cbc0d87004103b3cd9da68832a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_SUBST([LIBINPUT_VERSION], [libinput_version])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz subdir-objects])
 
 # Before making a release, the LIBINPUT_LT_VERSION string should be
 # modified.

diff --git a/test/Makefile.am b/test/Makefile.am
index 16dac419c974cc39be531d6fa79cf3c3b9b5cfc8..c3c293a064236fdc55ac7434322f12d4464ca283 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
 TEST_LIBS = liblitest.la $(CHECK_LIBS) $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libinput.la
 noinst_LTLIBRARIES = liblitest.la
 liblitest_la_SOURCES = \
-       $(top_srcdir)/src/libinput-util.h \
-       $(top_srcdir)/src/libinput-util.c \
+       ../src/libinput-util.h \
+       ../src/libinput-util.c \
        litest.h \
        litest-int.h \
        litest-bcm5974.c \