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

Make librfxcodec a subpackage

Browse Source 
Since libpainter is going to become a subpackage, we can make librfxcodec
a subpackage as well.

With this change, librfxcodec is configured, built and linked to xrdp
automatically if enabled by "--enable-rfxcodec"

librfxcodec is packaged by "make dist" regardless of "--enable-rfxcodec"

librfxcodec/confgure is run unconditionally, it's needed for "make dist"
to work. But librfxcodec is only compiled if enabled.
This commit is contained in:
Pavel Roskin 2016-12-11 23:09:15 -08:00
parent 870f028692
commit e65aa594e8
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 = XRDPVRDIR =
endif endif
if XRDP_RFXCODEC
RFXCODECDIR = librfxcodec
else
RFXCODECDIR =
endif
SUBDIRS = \ SUBDIRS = \
common \ common \
vnc \ vnc \
@ -24,6 +30,7 @@ SUBDIRS = \
mc \ mc \
$(NEUTRINORDPDIR) \ $(NEUTRINORDPDIR) \
libxrdp \ libxrdp \
$(RFXCODECDIR) \
xrdp \ xrdp \
sesman \ sesman \
keygen \ keygen \

2
configure.ac
View File

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

2
xrdp/Makefile.am
View File

@ -19,7 +19,7 @@ endif
if XRDP_RFXCODEC if XRDP_RFXCODEC
AM_CPPFLAGS += -DXRDP_RFXCODEC AM_CPPFLAGS += -DXRDP_RFXCODEC
AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include 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 endif
if XRDP_PIXMAN if XRDP_PIXMAN