[Spice-devel,vdagent-win,6/6] Makefile.am: add INCLUDES to AM_CPPFLAGS

Submitted by Uri Lublin on Nov. 7, 2013, 10:02 p.m.

Details

Message ID 1383861776-25959-7-git-send-email-uril@redhat.com
State Superseded
Headers show

Not browsing as part of any series.

Commit Message

Uri Lublin Nov. 7, 2013, 10:02 p.m.
Fixes the following autoreconf (automake) warning:
Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

Patch hide | download patch | download mbox

diff --git a/Makefile.am b/Makefile.am
index da0b5a5..fc017d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,13 @@  MAINTAINERCLEANFILES =

 DIST_SUBDIRS = spice-protocol

-INCLUDES =				\
+INC =					\
 	-I$(top_srcdir)/common		\
 	-I$(top_srcdir)/spice-protocol	\
 	$(NULL)

 AM_CXXFLAGS = -flto -fwhole-program
-AM_CPPFLAGS = -DUNICODE -D_UNICODE -DOLDMSVCRT
+AM_CPPFLAGS = -DUNICODE -D_UNICODE -DOLDMSVCRT $(INC)
 AM_LDFLAGS = -static
 if !ENABLE_DEBUG
 AM_LDFLAGS += -s

Comments

On Thu, Nov 7, 2013 at 11:02 PM, Uri Lublin <uril@redhat.com> wrote:
> Fixes the following autoreconf (automake) warning:
> Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
>
> diff --git a/Makefile.am b/Makefile.am
> index da0b5a5..fc017d5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -3,13 +3,13 @@ MAINTAINERCLEANFILES =
>
>  DIST_SUBDIRS = spice-protocol
>
> -INCLUDES =                             \
> +INC =                                  \
>         -I$(top_srcdir)/common          \
>         -I$(top_srcdir)/spice-protocol  \
>         $(NULL)
>

The renaming is worse :) I would just move that to AM_CPPFLAGS declaration.

>  AM_CXXFLAGS = -flto -fwhole-program
> -AM_CPPFLAGS = -DUNICODE -D_UNICODE -DOLDMSVCRT
> +AM_CPPFLAGS = -DUNICODE -D_UNICODE -DOLDMSVCRT $(INC)
>  AM_LDFLAGS = -static
>  if !ENABLE_DEBUG
>  AM_LDFLAGS += -s
> --
> 1.8.3.1
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
On Fri, Nov 08, 2013 at 12:02:56AM +0200, Uri Lublin wrote:
> Fixes the following autoreconf (automake) warning:
> Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
> 
> diff --git a/Makefile.am b/Makefile.am
> index da0b5a5..fc017d5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -3,13 +3,13 @@ MAINTAINERCLEANFILES =
> 
>  DIST_SUBDIRS = spice-protocol
> 
> -INCLUDES =				\
> +INC =					\
>  	-I$(top_srcdir)/common		\
>  	-I$(top_srcdir)/spice-protocol	\
>  	$(NULL)
> 
>  AM_CXXFLAGS = -flto -fwhole-program
> -AM_CPPFLAGS = -DUNICODE -D_UNICODE -DOLDMSVCRT
> +AM_CPPFLAGS = -DUNICODE -D_UNICODE -DOLDMSVCRT $(INC)

Can you make that one
AM_CPPFLAGS =				\
	-DUNICODE			\
	-D_UNICODE			\
	-DOLDMSVCRT			\
	-I$(top_srcdir)/common		\
	-I$(top_srcdir)/spice-protocol	\
	$(NULL)
and remove INCLUDES/INC?
Imo it's easier to read

Christophe