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

Submitted by Uri Lublin on Nov. 13, 2013, 9:22 a.m.

Details

Message ID 1384334553-24233-7-git-send-email-uril@redhat.com
State Accepted
Headers show

Not browsing as part of any series.

Commit Message

Uri Lublin Nov. 13, 2013, 9:22 a.m.
Fixes the following autoreconf (automake) warning:
Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
---
 Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

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

 DIST_SUBDIRS = spice-protocol

-INCLUDES =				\
+AM_CXXFLAGS = -flto -fwhole-program
+AM_CPPFLAGS = 				\
+	-DUNICODE 			\
+	-D_UNICODE			\
+	-DOLDMSVCRT			\
 	-I$(top_srcdir)/common		\
 	-I$(top_srcdir)/spice-protocol	\
 	$(NULL)

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