Merge remote-tracking branch 'origin/master'

This commit is contained in:
Simon McVittie 2016-08-16 00:21:19 +01:00
commit b2ec081f4f
2 changed files with 8 additions and 0 deletions

View file

@ -4,6 +4,10 @@ AM_CPPFLAGS = \
-DDBUS_COMPILATION \
$(NULL)
AM_CFLAGS = \
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
# if assertions are enabled, improve backtraces
AM_LDFLAGS = @R_DYNAMIC_LDFLAG@

View file

@ -6,6 +6,10 @@ AM_CPPFLAGS = \
-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
$(NULL)
AM_CFLAGS = \
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
# if assertions are enabled, improve backtraces
AM_LDFLAGS = @R_DYNAMIC_LDFLAG@