diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-03-04 10:37:49 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-01 13:39:29 +0100 |
| commit | aae4f0051ed6aa2f066461d6cda24eb53e203742 (patch) | |
| tree | 37451375af661b8cc942333666f1f1f6c71451e4 | |
| parent | 1f70ceba55e45c7b3165d0084a4a2334b872dbcc (diff) | |
Move Autoconf/Automake droppings into /build-aux/tests
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/name-test/Makefile.am | 2 |
4 files changed, 4 insertions, 2 deletions
@@ -3,6 +3,7 @@ *.rej *.o *~ +/build-aux/ compile config.cache config.log diff --git a/configure.ac b/configure.ac index 40546d72..d1c1a0dc 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ m4_define([dbus_micro_version], [15]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST diff --git a/test/Makefile.am b/test/Makefile.am index 4e46e325..05459ed5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -38,7 +38,7 @@ libdbus_testutils_la_LIBADD = \ TEST_EXTENSIONS = .sh -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh +LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh LOG_COMPILER = $(srcdir)/glib-tap-test.sh SH_LOG_DRIVER = $(LOG_DRIVER) SH_LOG_COMPILER = $(SHELL) diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 3564c851..0922558f 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -9,7 +9,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ TEST_EXTENSIONS = .sh -SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh +SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh SH_LOG_COMPILER = $(SHELL) ## note that TESTS has special meaning (stuff to use in make check) |