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.

common/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
   xrdp_rail.h \
   crc16.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \

keygen/Makefile.am

@@ -1,11 +1,9 @@
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 bin_PROGRAMS = \

libxrdp/Makefile.am

@@ -28,14 +28,12 @@ EXTRA_LIBS += -ljpeg
 endif
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+  $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common \
   $(EXTRA_INCLUDES)
 

mc/Makefile.am

@@ -1,12 +1,10 @@
 EXTRA_DIST = mc.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 lib_LTLIBRARIES = \

neutrinordp/Makefile.am

@@ -7,14 +7,12 @@ else
 EXTRA_DEFINES += -DXRDP_NODEBUG
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+  $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common \
   $(FREERDP_CFLAGS)
 

rdp/Makefile.am

@@ -7,14 +7,12 @@ else
 EXTRA_DEFINES += -DXRDP_NODEBUG
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+  $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common
 
 lib_LTLIBRARIES = \

sesman/Makefile.am

@@ -2,13 +2,11 @@
 EXTRA_DIST = sesman.ini startwm.sh sesman.h access.h auth.h config.h env.h \
 scp.h scp_v0.h scp_v1.h scp_v1_mng.h session.h sig.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common \
   -I$(top_srcdir)/sesman/libscp
 

sesman/chansrv/Makefile.am

@@ -31,14 +31,12 @@ EXTRA_DEFINES += -DXRDP_OPUS
 EXTRA_LIBS += -lopus
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+  $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common \
   $(EXTRA_INCLUDES)
 

sesman/libscp/Makefile.am

@@ -1,13 +1,11 @@
 EXTRA_DIST = libscp_connection.h libscp_commands.h libscp.h libscp_session.h libscp_types_mng.h libscp_v1c_mng.h libscp_vX.h libscp_commands_mng.h libscp_init.h libscp_tcp.h libscp_v0.h libscp_v1s.h libscp_lock.h \
 libscp_types.h libscp_v1c.h libscp_v1s_mng.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 lib_LTLIBRARIES = \

sesman/sessvc/Makefile.am

@@ -1,11 +1,9 @@
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 sbin_PROGRAMS = \

sesman/tools/Makefile.am

@@ -1,12 +1,10 @@
 EXTRA_DIST = tcp.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common \
   -I$(top_srcdir)/sesman/libscp \
   -I$(top_srcdir)/sesman

vnc/Makefile.am

@@ -1,12 +1,10 @@
 EXTRA_DIST = vnc.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 lib_LTLIBRARIES = \

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 \

xrdpapi/Makefile.am

@@ -5,10 +5,8 @@ EXTRA_INCLUDES =
 EXTRA_LIBS =
 EXTRA_FLAGS =
 
-AM_CFLAGS = \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+AM_CPPFLAGS = \
+  $(EXTRA_DEFINES) \
   $(EXTRA_INCLUDES)
 
 lib_LTLIBRARIES = \

xrdpvr/Makefile.am

@@ -5,10 +5,8 @@ EXTRA_INCLUDES =
 EXTRA_LIBS =
 EXTRA_FLAGS =
 
-AM_CFLAGS = \
-  $(EXTRA_DEFINES)
-
-INCLUDES = \
+AM_CPPFLAGS = \
+  $(EXTRA_DEFINES) \
   $(EXTRA_INCLUDES)
 
 lib_LTLIBRARIES = \

xup/Makefile.am

@@ -1,12 +1,10 @@
 EXTRA_DIST = xup.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 lib_LTLIBRARIES = \