diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-10-17 10:33:28 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-10-20 10:43:02 -0700 |
| commit | 0422734fc77bdff2c65df14f27b0fd0400775b23 (patch) | |
| tree | be59ff10236e777ef83e5d27fe91e7933661296f /sesman | |
| parent | 85e98d211a4cad94ebcd87c91966c8f30e4e0b9d (diff) | |
| download | xrdp-proprietary-0422734fc77bdff2c65df14f27b0fd0400775b23.tar.gz xrdp-proprietary-0422734fc77bdff2c65df14f27b0fd0400775b23.zip | |
Merge EXTRA_DEFINES and EXTRA_INCLUDES into AM_CPPFLAGS
AM_CPPFLAGS is a documented Automake variable for C preprocessor flags
that should not be overridden when compiling the package.
There is no need to have two additional variables that are ultimately
merged into AM_CPPFLAGS.
Their names are also confusing. EXTDA_DIST is a documented Automake
variable. Everything else that starts with "EXTRA" is not.
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/chansrv/Makefile.am | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index c4cd1a3f..161c07fa 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -1,32 +1,28 @@ -EXTRA_DEFINES = -EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = +AM_CPPFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ + -DXRDP_SBIN_PATH=\"${sbindir}\" \ + -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" \ + -I$(top_srcdir)/common + if XRDP_FUSE -EXTRA_DEFINES += -DXRDP_FUSE +AM_CPPFLAGS += -DXRDP_FUSE EXTRA_LIBS += -lfuse endif if XRDP_OPUS -EXTRA_DEFINES += -DXRDP_OPUS +AM_CPPFLAGS += -DXRDP_OPUS EXTRA_LIBS += -lopus endif if XRDP_MP3LAME -EXTRA_DEFINES += -DXRDP_MP3LAME +AM_CPPFLAGS += -DXRDP_MP3LAME EXTRA_LIBS += -lmp3lame endif -AM_CPPFLAGS = \ - -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ - -DXRDP_SBIN_PATH=\"${sbindir}\" \ - -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ - -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - $(EXTRA_DEFINES) \ - -I$(top_srcdir)/common \ - $(EXTRA_INCLUDES) - AM_CFLAGS = $(X_CFLAGS) sbin_PROGRAMS = \ |