[debian-edu-commits] debian-edu/ 09/22: Fix Makefile patches.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch fix-repo
in repository xrdp.

commit 03c798fc105cf7d32068dd781902603d811302f3
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 27 21:55:35 2016 +0200

    Fix Makefile patches.
---
 debian/patches/make-fixes.diff | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/debian/patches/make-fixes.diff b/debian/patches/make-fixes.diff
index 1f4bed6..e5a403c 100644
--- a/debian/patches/make-fixes.diff
+++ b/debian/patches/make-fixes.diff
@@ -49,3 +49,26 @@
  CFLAGS="$save_CFLAGS"
  
  AC_SUBST([moduledir], '${libdir}/xrdp')
+--- 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_srcdir)/librfxcodec/src/.libs/librfxencode.la
+ endif
+ 
+ if XRDP_PIXMAN
+--- a/xrdpapi/Makefile.am
++++ b/xrdpapi/Makefile.am
+@@ -4,3 +4,9 @@ module_LTLIBRARIES = \
+ libxrdpapi_la_SOURCES = \
+   xrdpapi.c \
+   xrdpapi.h
++
++AM_CPPFLAGS = \
++  -I$(top_srcdir)/common
++
++libxrdpapi_la_LIBADD = \
++  $(top_builddir)/common/libcommon.la

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git