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

Merge pull request #566 from proski/painter

Browse Source 
Compile libpainter only if enabled, fix path to libpainter.a
This commit is contained in:
Itamar Reis Peixoto 2016-12-20 23:54:46 -02:00 committed by GitHub
commit 8284416e35
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -33,6 +33,12 @@ else
XRDPVRDIR = XRDPVRDIR =
endif endif
if XRDP_PAINTER
PAINTERDIR = libpainter
else
PAINTERDIR =
endif
if XRDP_RFXCODEC if XRDP_RFXCODEC
RFXCODECDIR = librfxcodec RFXCODECDIR = librfxcodec
else else
@ -40,7 +46,6 @@ RFXCODECDIR =
endif endif
SUBDIRS = \ SUBDIRS = \
libpainter \
common \ common \
vnc \ vnc \
rdp \ rdp \
@ -48,6 +53,7 @@ SUBDIRS = \
mc \ mc \
$(NEUTRINORDPDIR) \ $(NEUTRINORDPDIR) \
libxrdp \ libxrdp \
$(PAINTERDIR) \
$(RFXCODECDIR) \ $(RFXCODECDIR) \
xrdp \ xrdp \
sesman \ sesman \

2
xrdp/Makefile.am
View File

@ -36,7 +36,7 @@ endif
if XRDP_PAINTER if XRDP_PAINTER
AM_CPPFLAGS += -DXRDP_PAINTER AM_CPPFLAGS += -DXRDP_PAINTER
AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include
XRDP_EXTRA_LIBS += $(top_srcdir)/libpainter/src/.libs/libpainter.a XRDP_EXTRA_LIBS += $(top_builddir)/libpainter/src/.libs/libpainter.a
endif endif
sbin_PROGRAMS = \ sbin_PROGRAMS = \