aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-22 18:06:46 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-22 18:35:29 +0800
commit506d80481e303bdc03cf93e0688a96d2253bf822 (patch)
tree70e3a40d46032470c888605956ae9c96369bb712
parent4b0430db4bf7cdbef60290bdcca94bd1e5cf05d3 (diff)
downloadgsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.tar
gsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.tar.gz
gsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.tar.bz2
gsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.tar.lz
gsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.tar.xz
gsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.tar.zst
gsoc2013-empathy-506d80481e303bdc03cf93e0688a96d2253bf822.zip
Use AC_PROG_MKDIR_P and MKDIR_P instead of AM_PROG_MKDIR_P and mkdir_p
The latter are deprecated, and recent Automake makes a lot of noise about them.
-rw-r--r--configure.ac2
-rw-r--r--extensions/Makefile.am4
-rw-r--r--tools/lcov.am2
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 9c127ed8b..c5f1a709c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,7 @@ AM_SILENT_RULES([yes])
# Check for programs
AC_PROG_CC
AC_HEADER_STDC
-AM_PROG_MKDIR_P
+AC_PROG_MKDIR_P
AM_PATH_GLIB_2_0
AC_PATH_XTRA
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 69e7c00d0..f72c407c0 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -59,7 +59,7 @@ XSLTPROCFLAGS = --nonet --novalid
# Generated files which can be generated for all categories simultaneously
_gen/all.xml: all.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
- @$(mkdir_p) _gen
+ @$(MKDIR_P) _gen
$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
@@ -94,7 +94,7 @@ _gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
# although you can subdivide further if you want.
_gen/misc.xml: misc.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
- @$(mkdir_p) _gen
+ @$(MKDIR_P) _gen
$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
_gen/cli-misc-body.h: _gen/cli-misc.h
diff --git a/tools/lcov.am b/tools/lcov.am
index 80023cb78..d2d282ac3 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
echo "Coming soon!" > @top_builddir@/lcov.html/index.html
git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\
genhtml --title "@PACKAGE_STRING@ $$git_commit" \