From a452d8d36aafda4a873f8c035a3fe3fd51fabd96 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Fri, 29 Jan 2016 22:45:00 -0800
Subject: Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGS

AM_CPPFLAGS is for flags passed to the preprocessor, such as defines and
includes. AM_CFLAGS is for flags affecting the compiler, such as debug
and optimization settings.

INCLUDES is an obsolete name. Users can pass INCLUDES and break
compilation. AM_CPPFLAGS is more explicit that the flags come from
Automake and should not be overridden.
---
 xrdp/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'xrdp/Makefile.am')

diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index 8014761a..308f01a4 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -17,15 +17,13 @@ EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
 EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -DXRDP_LIB_PATH=\"${libdir}\" \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+  $(EXTRA_DEFINES) \
   -I$(top_builddir) \
   -I$(top_srcdir)/common \
   -I$(top_srcdir)/libxrdp \
-- 
cgit v1.2.1