Compile libpainter only if enabled, fix path to libpainter.a

When subpackages are compiled outside the build tree, the build artifacts
are placed under top_builddir.
master
Pavel Roskin 8 years ago
parent 634aa1096f
commit 0e7bc6e111

@ -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 \

@ -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 = \

Loading…
Cancel
Save