fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure.ac: Add subdir-objects to AM_INIT_AUTOMAKE paramaters

Browse source 
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>
This commit is contained in:
Jonas Ådahl 2014-07-15 23:25:28 +02:00
parent dacc6383c7
commit a474a7648d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -20,7 +20,7 @@ AC_SUBST([LIBINPUT_VERSION], [libinput_version])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) 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 # Before making a release, the LIBINPUT_LT_VERSION string should be
# modified. # modified.

4
test/Makefile.am
View file

@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
TEST_LIBS = liblitest.la $(CHECK_LIBS) $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libinput.la TEST_LIBS = liblitest.la $(CHECK_LIBS) $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libinput.la
noinst_LTLIBRARIES = liblitest.la noinst_LTLIBRARIES = liblitest.la
liblitest_la_SOURCES = \ liblitest_la_SOURCES = \
$(top_srcdir)/src/libinput-util.h \ ../src/libinput-util.h \
$(top_srcdir)/src/libinput-util.c \ ../src/libinput-util.c \
litest.h \ litest.h \
litest-int.h \ litest-int.h \
litest-bcm5974.c \ litest-bcm5974.c \