diff options
author | Brian Pepple <bpepple@fedoraproject.org> | 2013-03-27 20:01:51 -0400 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-03-28 11:12:33 +0000 |
commit | 9a7aeb5a81dbb4fd000c17bcf34929513a35067e (patch) | |
tree | df9fd0db8060dbeb64f77b1eaadcf6d4a1b7a4d4 | |
parent | b0d9f44e34d9a86efa80ad1d51551a08273437f8 (diff) |
Remove deprecated macros.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=62839
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
[added AC_PREREQ bump to 2.60 for AC_PROG_MKDIR_P -smcv]
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | docs/Makefile.am | 2 | ||||
-rw-r--r-- | extensions/Makefile.am | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index bad1b3e..eaa7c17 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.59]) +AC_PREREQ([2.60]) m4_define([THIS_PACKAGE],[telepathy-rakia]) m4_define([VERSION_MAJOR],[0]) @@ -27,7 +27,7 @@ AC_CONFIG_HEADER([config.h]) dnl check for tools AC_PROG_CC AC_PROG_CC_STDC -AM_PROG_MKDIR_P +AC_PROG_MKDIR_P AC_PROG_LIBTOOL diff --git a/docs/Makefile.am b/docs/Makefile.am index 7498c5d..a5fe109 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -67,7 +67,7 @@ expand_content_files= # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES= +AM_CPPFLAGS= GTKDOC_LIBS= # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/extensions/Makefile.am b/extensions/Makefile.am index d1e147d..8208a7e 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -49,7 +49,7 @@ XSLTPROCFLAGS = --nonet --novalid # Generated files which can be generated for all categories simultaneously _gen/all.xml: all.xml $(wildcard *.xml) - $(mkdir_p) _gen + $(MKDIR_P) _gen $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ $< > $@ @@ -105,7 +105,7 @@ _gen/interfaces-body.h: _gen/all.xml \ # although you can subdivide further if you want. _gen/channel.xml: channel.xml $(wildcard *.xml) - $(mkdir_p) _gen + $(MKDIR_P) _gen $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ $< > $@ |