Merge branch 'devel' into add_logging_session_c

2021-04-14 10:26:48 +01:00 · 2021-04-14 10:26:48 +01:00 · cb0ab0d0d3
commit cb0ab0d0d3
parent 28bce37d04 2cc2f9f5f2
2 changed files with 6 additions and 3 deletions
--- a/tests/memtest/Makefile.am
+++ b/tests/memtest/Makefile.am
@ -6,6 +6,9 @@ if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
 endif

+noinst_PROGRAMS = \
+  memtest
+
 check_PROGRAMS = \
  memtest

@ -18,4 +21,4 @@ memtest_LDADD = \
  $(top_builddir)/common/libcommon.la

 TESTS = \
-  memtest
+  memtest
--- a/tools/devel/tcp_proxy/Makefile.am
+++ b/tools/devel/tcp_proxy/Makefile.am
@ -6,7 +6,7 @@ if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
 endif

-sbin_PROGRAMS = \
+noinst_PROGRAMS = \
  tcp_proxy

 tcp_proxy_SOURCES = \
@ -14,4 +14,4 @@ tcp_proxy_SOURCES = \

 tcp_proxy_LDADD = \
  $(top_builddir)/common/libcommon.la \
-  -ldl
+  -ldl