From 40e3421bf13f44b2d9a35cb3fedfc4852310cc4f Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 3 Apr 2023 15:50:03 +0900 Subject: [PATCH] Integrate tomlc99 into xrdp build --- Makefile.am | 2 ++ configure.ac | 1 + xrdp/Makefile.am | 2 ++ 3 files changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index 59479f05..eab126c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,9 @@ else ULALACADIR = endif +# This should not be dictionary order but build order SUBDIRS = \ + third_party/tomlc99 \ common \ vnc \ xup \ diff --git a/configure.ac b/configure.ac index b8d52b1f..86725410 100644 --- a/configure.ac +++ b/configure.ac @@ -608,6 +608,7 @@ AC_CONFIG_FILES([ xrdp/Makefile xrdpvr/Makefile xup/Makefile + third_party/tomlc99/Makefile ]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 960260d5..cae8dc91 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/libipm \ -I$(top_srcdir)/libxrdp \ + -I$(top_srcdir)/third_party/tomlc99 \ $(IMLIB2_CFLAGS) XRDP_EXTRA_LIBS = @@ -67,6 +68,7 @@ xrdp_LDADD = \ $(top_builddir)/common/libcommon.la \ $(top_builddir)/libipm/libipm.la \ $(top_builddir)/libxrdp/libxrdp.la \ + $(top_builddir)/third_party/tomlc99/libtoml.la \ $(IMLIB2_LIBS) \ $(XRDP_EXTRA_LIBS)