diff options
| author | Idan Freiberg <speidy@gmail.com> | 2016-12-17 10:05:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-17 10:05:15 -0500 |
| commit | d706f9dba4fa95eff0b0d4dd7e3806568ce75ec7 (patch) | |
| tree | 505be1822f6d101992a0db23c70da58c9156857b | |
| parent | 870f028692c0267069ebb4cc616faccd739f843a (diff) | |
| parent | e65aa594e8e76b8ecb9f31b7204d5fc96818425a (diff) | |
| download | xrdp-proprietary-d706f9dba4fa95eff0b0d4dd7e3806568ce75ec7.tar.gz xrdp-proprietary-d706f9dba4fa95eff0b0d4dd7e3806568ce75ec7.zip | |
Merge pull request #539 from proski/rxfcodec
Make librfxcodec a subpackage
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xrdp/Makefile.am | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c50ea295..8b7580bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/configure.ac b/configure.ac index d8387114..40ed06d1 100644 --- a/configure.ac +++ b/configure.ac @@ -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])]) diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 400a4285..0f2e6f65 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -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 |