[PATCH BlueZ 1/2] build-sys: Don't use deprecated AM_PROG_MKDIR_P

[PATCH BlueZ 1/2] build-sys: Don't use deprecated AM_PROG_MKDIR_P

[Lucas De Marchi]

AM_PROG_MKDIR_P is deprecated since:

configure.ac:23: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and will soon be removed.
configure.ac:23: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
configure.ac:23: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.

We are already using $(MKDIR_P) so we just need to call the right macro.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7d9a34d..deab9e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
-AM_PROG_MKDIR_P
+AC_PROG_MKDIR_P
 
 m4_define([_LT_AC_TAGCONFIG], [])
 m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
-- 
1.7.12.2

[PATCH BlueZ 2/2] build-sys: Don't use deprecated INCLUDES variable

[Lucas De Marchi]

Makefile.am:410: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dea207e..3b08f9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -407,13 +407,13 @@ AM_YFLAGS = -d
 
 AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
+AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
 			-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
 			-I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \
 			-I$(builddir)/tools -I$(srcdir)/monitor
 
 if MCAP
-INCLUDES += -I$(builddir)/health
+AM_CPPFLAGS += -I$(builddir)/health
 endif
 
 unit_objects =
-- 
1.7.12.2

Re: [PATCH BlueZ 1/2] build-sys: Don't use deprecated AM_PROG_MKDIR_P

[Johan Hedberg]

Hi Lucas,

On Thu, Oct 04, 2012, Lucas De Marchi wrote:
> AM_PROG_MKDIR_P is deprecated since:
> 
> configure.ac:23: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and will soon be removed.
> configure.ac:23: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
> configure.ac:23: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
> 
> We are already using $(MKDIR_P) so we just need to call the right macro.
> ---
>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Both patches have been applied. Thanks.

Johan

Re: [PATCH BlueZ 2/2] build-sys: Don't use deprecated INCLUDES variable

[Anderson Lizardo]

Hi Lucas/Johan,

On Thu, Oct 4, 2012 at 2:37 AM, Lucas De Marchi
<lucas.demarchi@profusion.mobi> wrote:
> Makefile.am:410: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
> ---
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index dea207e..3b08f9a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -407,13 +407,13 @@ AM_YFLAGS = -d
>
>  AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
>
> -INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
> +AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
>                         -I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
>                         -I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \
>                         -I$(builddir)/tools -I$(srcdir)/monitor
>
>  if MCAP
> -INCLUDES += -I$(builddir)/health
> +AM_CPPFLAGS += -I$(builddir)/health
>  endif

This reminds me that the patch I sent few days ago which removes the
snippet above (which is unnecessary, given the directory does not
exist anymore and profiles/health still builds just fine) was not
applied yet.

I'll rebase and resend. There were comments from Marcel regarding the
use of symlinks for drivers (i.e. telephony, sap), which will be
addressed in a separate patch.

Best Regards,
-- 
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil