diff options
| author | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2016-10-21 16:55:55 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 16:55:55 -0200 |
| commit | 8bf28e45c4ff59f3195966a107611b211ee5aca3 (patch) | |
| tree | ed0a9eb35e6a1ac50add0b0589111637538b20e8 /sesman | |
| parent | 85e98d211a4cad94ebcd87c91966c8f30e4e0b9d (diff) | |
| parent | a370306f75e72a38f37a0cc7ee1fae595d3c80bc (diff) | |
| download | xrdp-proprietary-8bf28e45c4ff59f3195966a107611b211ee5aca3.tar.gz xrdp-proprietary-8bf28e45c4ff59f3195966a107611b211ee5aca3.zip | |
Merge pull request #445 from proski/noextra
Avoid using non-standard Automake variables starting with "EXTRA"
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/chansrv/Makefile.am | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index c4cd1a3f..2ecd67b4 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -1,32 +1,27 @@ -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 + +CHANSRV_EXTRA_LIBS = if XRDP_FUSE -EXTRA_DEFINES += -DXRDP_FUSE -EXTRA_LIBS += -lfuse +AM_CPPFLAGS += -DXRDP_FUSE +CHANSRV_EXTRA_LIBS += -lfuse endif if XRDP_OPUS -EXTRA_DEFINES += -DXRDP_OPUS -EXTRA_LIBS += -lopus +AM_CPPFLAGS += -DXRDP_OPUS +CHANSRV_EXTRA_LIBS += -lopus endif if XRDP_MP3LAME -EXTRA_DEFINES += -DXRDP_MP3LAME -EXTRA_LIBS += -lmp3lame +AM_CPPFLAGS += -DXRDP_MP3LAME +CHANSRV_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 = \ @@ -65,10 +60,9 @@ xrdp_chansrv_SOURCES = \ xcommon.h xrdp_chansrv_LDFLAGS = \ - $(X_LIBS) \ - $(EXTRA_FLAGS) + $(X_LIBS) xrdp_chansrv_LDADD = \ $(top_builddir)/common/libcommon.la \ $(X_PRE_LIBS) -lXfixes -lXrandr -lX11 $(X_EXTRA_LIBS) \ - $(EXTRA_LIBS) + $(CHANSRV_EXTRA_LIBS) |