diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2014-07-15 23:25:28 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2014-07-15 23:44:50 +0200 |
| commit | a474a7648d0420dfee80bb9cf020e71cbd592da3 (patch) | |
| tree | 611aa54d67279e1fd57d62be3536fa15d3d4bfc7 | |
| parent | dacc6383c71e57a5a4a71525116a42615cb56ea8 (diff) | |
| download | libinput-a474a7648d0420dfee80bb9cf020e71cbd592da3.tar.gz | |
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>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | 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 \ |