jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGS

Browse Source 
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.
This commit is contained in:
Pavel Roskin 2016-01-29 22:45:00 -08:00
parent 309fca35ac
commit a452d8d36a
16 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile.am
View File

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

6
keygen/Makefile.am
View File

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

6
libxrdp/Makefile.am
View File

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

6
mc/Makefile.am
View File

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

6
neutrinordp/Makefile.am
View File

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

6
rdp/Makefile.am
View File

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

6
sesman/Makefile.am
View File

@ -2,13 +2,11 @@
EXTRA_DIST = sesman.ini startwm.sh sesman.h access.h auth.h config.h env.h \ 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 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_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" -DXRDP_PID_PATH=\"${localstatedir}/run\" \
INCLUDES = \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_srcdir)/sesman/libscp -I$(top_srcdir)/sesman/libscp

6
sesman/chansrv/Makefile.am
View File

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

6
sesman/libscp/Makefile.am
View File

@ -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 \ 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 libscp_types.h libscp_v1c.h libscp_v1s_mng.h
AM_CFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" -DXRDP_PID_PATH=\"${localstatedir}/run\" \
INCLUDES = \
-I$(top_srcdir)/common -I$(top_srcdir)/common
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \

6
sesman/sessvc/Makefile.am
View File

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

6
sesman/tools/Makefile.am
View File

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

6
vnc/Makefile.am
View File

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

6
xrdp/Makefile.am
View File

@ -17,15 +17,13 @@ EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a
endif endif
AM_CFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LIB_PATH=\"${libdir}\" \ -DXRDP_LIB_PATH=\"${libdir}\" \
$(EXTRA_DEFINES) $(EXTRA_DEFINES) \
INCLUDES = \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_srcdir)/libxrdp \ -I$(top_srcdir)/libxrdp \

6
xrdpapi/Makefile.am
View File

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

6
xrdpvr/Makefile.am
View File

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

6
xup/Makefile.am
View File

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