mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #539 from proski/rxfcodec 

Make librfxcodec a subpackage
This commit is contained in:
Idan Freiberg 2016-12-17 10:05:15 -05:00 committed by GitHub
parent 870f028692 e65aa594e8
commit d706f9dba4
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -16,6 +16,12 @@ else
XRDPVRDIR =
endif
if XRDP_RFXCODEC
RFXCODECDIR = librfxcodec
else
RFXCODECDIR =
endif
SUBDIRS = \
common \
vnc \
@ -24,6 +30,7 @@ SUBDIRS = \
mc \
$(NEUTRINORDPDIR) \
libxrdp \
$(RFXCODECDIR) \
xrdp \
sesman \
keygen \

2
configure.ac
View File

@ -10,6 +10,8 @@ AC_C_CONST
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
AC_CONFIG_SUBDIRS([librfxcodec])
# Use silent rules by default if supported by Automake
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

2
xrdp/Makefile.am
View File

@ -19,7 +19,7 @@ endif
if XRDP_RFXCODEC
AM_CPPFLAGS += -DXRDP_RFXCODEC
AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.a
endif
if XRDP_PIXMAN