Merge branch 'devel' into add_logging_session_c

This commit is contained in:
matt335672 2021-04-14 10:26:48 +01:00 committed by GitHub
commit cb0ab0d0d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -6,6 +6,9 @@ if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG AM_CPPFLAGS += -DXRDP_DEBUG
endif endif
noinst_PROGRAMS = \
memtest
check_PROGRAMS = \ check_PROGRAMS = \
memtest memtest
@ -18,4 +21,4 @@ memtest_LDADD = \
$(top_builddir)/common/libcommon.la $(top_builddir)/common/libcommon.la
TESTS = \ TESTS = \
memtest memtest

View File

@ -6,7 +6,7 @@ if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG AM_CPPFLAGS += -DXRDP_DEBUG
endif endif
sbin_PROGRAMS = \ noinst_PROGRAMS = \
tcp_proxy tcp_proxy
tcp_proxy_SOURCES = \ tcp_proxy_SOURCES = \
@ -14,4 +14,4 @@ tcp_proxy_SOURCES = \
tcp_proxy_LDADD = \ tcp_proxy_LDADD = \
$(top_builddir)/common/libcommon.la \ $(top_builddir)/common/libcommon.la \
-ldl -ldl