diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-01-29 22:45:00 -0800 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-01-29 22:45:00 -0800 |
| commit | a452d8d36aafda4a873f8c035a3fe3fd51fabd96 (patch) | |
| tree | 17ce42f7a222d165308585f6d8be3e205a5e95f0 /sesman | |
| parent | 309fca35acfeb776a422d6140ddae8be0b1dbff0 (diff) | |
| download | xrdp-proprietary-a452d8d36aafda4a873f8c035a3fe3fd51fabd96.tar.gz xrdp-proprietary-a452d8d36aafda4a873f8c035a3fe3fd51fabd96.zip | |
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.
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/chansrv/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/libscp/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/sessvc/Makefile.am | 6 | ||||
| -rw-r--r-- | sesman/tools/Makefile.am | 6 |
5 files changed, 10 insertions, 20 deletions
diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 55056031..979f72d9 100644 --- a/sesman/Makefile.am +++ b/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 diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index 755de786..1a0be24c 100644 --- a/sesman/chansrv/Makefile.am +++ b/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) diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am index eaf518a8..3172f2cb 100644 --- a/sesman/libscp/Makefile.am +++ b/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 = \ diff --git a/sesman/sessvc/Makefile.am b/sesman/sessvc/Makefile.am index 8ba24abd..c2714b94 100644 --- a/sesman/sessvc/Makefile.am +++ b/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 = \ diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am index 140c6820..fa4568ef 100644 --- a/sesman/tools/Makefile.am +++ b/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 |