diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-05 17:45:15 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-05 17:45:15 +0000 |
| commit | dc482a8a75c77acfa6aa1ab2f7f52b5364ba86fe (patch) | |
| tree | e1d0ea18727ad81b2432e73cdb6397cf856a5e0c | |
| parent | be73009737b3df81c89d5a519796ac13881aa96c (diff) | |
| parent | 05c2449384d517b94cf0146908fdacfc7f4d4c8d (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | tools/lcov.am | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -33,6 +33,7 @@ src/*-enumtypes.[ch] # Autogenerated build files /aclocal.m4 /autom4te.cache +/build-aux /compile /config.guess* /config.h.in diff --git a/configure.ac b/configure.ac index 0b2c173..7d53a27 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,13 @@ m4_define([THIS_VERSION], AC_INIT(THIS_PACKAGE, THIS_VERSION) AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) AS_VERSION(THIS_PACKAGE, TELEPATHY_SIP_VERSION, VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO, VERSION_NANO, IS_RELEASE="yes", IS_RELEASE="no") -AM_INIT_AUTOMAKE([1.9 -Wno-portability]) +AM_INIT_AUTOMAKE([1.9 -Wno-portability subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_DISABLE_SHARED diff --git a/tools/lcov.am b/tools/lcov.am index 09f2534..44614e2 100644 --- a/tools/lcov.am +++ b/tools/lcov.am @@ -7,7 +7,7 @@ lcov-report: lcov --directory @top_srcdir@ --output-file @top_builddir@/lcov.info \ --remove @top_builddir@/lcov.info.tmp telepathy-glib-scan.c rm @top_builddir@/lcov.info.tmp - $(mkdir_p) @top_builddir@/lcov.html + $(MKDIR_P) @top_builddir@/lcov.html git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\ genhtml --title "@PACKAGE_STRING@ $$git_commit" \ --output-directory @top_builddir@/lcov.html lcov.info |