telepathy-glib: Use AC_PROG_MKDIR_P instead of deprecated AM_PROG_MKDIR_P
Simon McVittie
smcv at kemper.freedesktop.org
Thu Jun 20 07:41:54 PDT 2013
Module: telepathy-glib
Branch: master
Commit: 0e944e7d41b38cb248a2164468d2fe064f61819d
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=0e944e7d41b38cb248a2164468d2fe064f61819d
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Fri Jun 7 17:08:53 2013 +0100
Use AC_PROG_MKDIR_P instead of deprecated AM_PROG_MKDIR_P
This means we define MKDIR_P instead of mkdir_p - adjust.
Strictly speaking this requires Autoconf 2.59d, but 2.60 is hardly a
new innovation (it was released in 2006).
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65517
---
configure.ac | 4 ++--
examples/cm/call/Makefile.am | 2 +-
examples/cm/channelspecific/Makefile.am | 2 +-
examples/cm/contactlist/Makefile.am | 2 +-
examples/cm/echo-message-parts/Makefile.am | 2 +-
examples/cm/extended/Makefile.am | 2 +-
examples/cm/no-protocols/Makefile.am | 2 +-
examples/extensions/Makefile.am | 4 ++--
telepathy-glib/codegen.am | 2 +-
telepathy-glib/introspection.am | 2 +-
tests/dbus/Makefile.am | 4 ++--
tools/lcov.am | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index d69988c..6bc154b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.59])
+AC_PREREQ([2.60])
# Making releases:
# set the new version number:
@@ -53,7 +53,7 @@ AC_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AM_PROG_LIBTOOL
-AM_PROG_MKDIR_P
+AC_PROG_MKDIR_P
# pkg-config 0.21 adds CFLAGS from Requires.private, which we need
PKG_PROG_PKG_CONFIG([0.21])
diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am
index a2a4ec1..1b6f165 100644
--- a/examples/cm/call/Makefile.am
+++ b/examples/cm/call/Makefile.am
@@ -38,7 +38,7 @@ servicedir = ${datadir}/dbus-1/services
if INSTALL_EXAMPLES
service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_call.service
$(service_DATA): %: Makefile
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
{ echo "[D-BUS Service]" && \
echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_call" && \
echo "Exec=${libexecdir}/telepathy-example-cm-call"; } > $@
diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
index 730905c..4fb10b4 100644
--- a/examples/cm/channelspecific/Makefile.am
+++ b/examples/cm/channelspecific/Makefile.am
@@ -35,7 +35,7 @@ servicedir = ${datadir}/dbus-1/services
if INSTALL_EXAMPLES
service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_csh.service
$(service_DATA): %: Makefile
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
{ echo "[D-BUS Service]" && \
echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_csh" && \
echo "Exec=${libexecdir}/telepathy-example-cm-csh"; } > $@
diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
index 75416dc..74dbea9 100644
--- a/examples/cm/contactlist/Makefile.am
+++ b/examples/cm/contactlist/Makefile.am
@@ -31,7 +31,7 @@ if INSTALL_EXAMPLES
servicedir = ${datadir}/dbus-1/services
service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_contact_list.service
$(service_DATA): %: Makefile
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
{ echo "[D-BUS Service]" && \
echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_contact_list" && \
echo "Exec=${libexecdir}/telepathy-example-cm-contactlist"; } > $@
diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
index 8ecc5d7..5d0fc79 100644
--- a/examples/cm/echo-message-parts/Makefile.am
+++ b/examples/cm/echo-message-parts/Makefile.am
@@ -31,7 +31,7 @@ if INSTALL_EXAMPLES
servicedir = ${datadir}/dbus-1/services
service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_echo_2.service
$(service_DATA): %: Makefile
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
{ echo "[D-BUS Service]" && \
echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_echo_2" && \
echo "Exec=${libexecdir}/telepathy-example-cm-echo-2"; } > $@
diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
index 93a731f..81db349 100644
--- a/examples/cm/extended/Makefile.am
+++ b/examples/cm/extended/Makefile.am
@@ -19,7 +19,7 @@ if INSTALL_EXAMPLES
servicedir = ${datadir}/dbus-1/services
service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_extended.service
$(service_DATA): %: Makefile
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
{ echo "[D-BUS Service]" && \
echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_extended" && \
echo "Exec=${libexecdir}/telepathy-example-cm-extended"; } > $@
diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
index 791cc8b..ae35627 100644
--- a/examples/cm/no-protocols/Makefile.am
+++ b/examples/cm/no-protocols/Makefile.am
@@ -15,7 +15,7 @@ if INSTALL_EXAMPLES
servicedir = ${datadir}/dbus-1/services
service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_no_protocols.service
$(service_DATA): %: Makefile
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
{ echo "[D-BUS Service]" && \
echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_no_protocols" && \
echo "Exec=${libexecdir}/telepathy-example-cm-no-protocols"; } > $@
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index 1cb53d1..4cba359 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -72,7 +72,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
@@ -114,7 +114,7 @@ _gen/interfaces.h: _gen/all.xml \
# although you can subdivide further if you want.
_gen/connection.xml: connection.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
# do nothing, output as a side-effect
diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
index 8bc0032..a564a2a 100644
--- a/telepathy-glib/codegen.am
+++ b/telepathy-glib/codegen.am
@@ -136,7 +136,7 @@ tools_dir = $(top_srcdir)/tools
# Bootstrapping
_gen/spec-stamp: $(wildcard $(top_srcdir)/spec/*.xml)
- $(mkdir_p) _gen
+ $(MKDIR_P) _gen
touch $@
_gen/stable-stamp: $(wildcard $(abs_srcdir)/*.xml) _gen/spec-stamp
diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index 4789942..b415073 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -110,7 +110,7 @@ TelepathyGLib_0_12_gir_PACKAGES = \
$(NULL)
_gen/proxy-introspectable.h: proxy.h introspection.am
- @$(mkdir_p) _gen
+ @$(MKDIR_P) _gen
$(AM_V_GEN)sed -e 's/gpointer self/TpProxy *self/' < $< > $@
girdir = $(datadir)/gir-1.0
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 78ce997..4d02d23 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -348,14 +348,14 @@ run-test.sh: run-test.sh.in
@chmod +x $@
dbus-uninstalled/%.conf: $(srcdir)/dbus-uninstalled/%.conf.in
- $(AM_V_at)$(mkdir_p) dbus-uninstalled
+ $(AM_V_at)$(MKDIR_P) dbus-uninstalled
$(AM_V_GEN)sed \
-e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \
$< > $@
dbus-installed/%.conf: $(srcdir)/dbus-installed/%.conf.in
- $(AM_V_at)$(mkdir_p) dbus-installed
+ $(AM_V_at)$(MKDIR_P) dbus-installed
$(AM_V_GEN)sed -e "s|[@]tpglibtestsdir[@]|@tpglibtestsdir@|g" $< > $@
service_files = dbus-installed/services/spurious.service
diff --git a/tools/lcov.am b/tools/lcov.am
index 80023cb..d2d282a 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" \
More information about the telepathy-commits
mailing list