diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
| commit | 8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch) | |
| tree | 20000a90a738370fff9e44c5e8fbaccea08e949c /build-aux | |
| parent | 7308e9ffd1933c71e6134e1b9632683977a12f47 (diff) | |
| parent | db51244983a38d901fefd5e2a090f0e66343d98d (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# am-pretty.mk
# config.mk.in
# src/journal/Makefile
# src/kernel-install/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libsystemd/src/Makefile
# src/systemd-nspawn/Makefile
# src/systemd-nspawn/nspawn-network.c
# src/udev/udev.h
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 2 | ||||
| -rw-r--r-- | build-aux/Makefile.once.tail/20-systemd.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 0f07c88147..1c082c2483 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -20,6 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory AUTOMAKE_OPTIONS = color-tests parallel-tests @@ -57,4 +58,3 @@ define generate-sym-test $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@ $(AM_V_at)printf 'return 0; }\n' >> $@ endef - diff --git a/build-aux/Makefile.once.tail/20-systemd.mk b/build-aux/Makefile.once.tail/20-systemd.mk index d58c892243..9b70688fad 100644 --- a/build-aux/Makefile.once.tail/20-systemd.mk +++ b/build-aux/Makefile.once.tail/20-systemd.mk @@ -20,6 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. + # Let's run all tests of the test suite, but under valgrind. Let's # exclude perl/python/shell scripts we have in there .PHONY: valgrind-tests |