From a474a7648d0420dfee80bb9cf020e71cbd592da3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonas=20=C3=85dahl?= Date: Tue, 15 Jul 2014 23:25:28 +0200 Subject: [PATCH] configure.ac: Add subdir-objects to AM_INIT_AUTOMAKE paramaters MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Silences a warning when running autogen.sh. This also adds a work-around for a bug in automake replacing $(top_srcdir) with ../ in test/Makefile.am. Signed-off-by: Jonas Ådahl --- configure.ac | 2 +- test/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 65c915e6..fd402e20 100644 --- 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 16dac419..c3c293a0 100644 --- 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 \ -- 2.34.1