Integrate tomlc99 into xrdp build
This commit is contained in:
@@ -44,7 +44,9 @@ else
|
|||||||
ULALACADIR =
|
ULALACADIR =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# This should not be dictionary order but build order
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
third_party/tomlc99 \
|
||||||
common \
|
common \
|
||||||
vnc \
|
vnc \
|
||||||
xup \
|
xup \
|
||||||
|
|||||||
@@ -608,6 +608,7 @@ AC_CONFIG_FILES([
|
|||||||
xrdp/Makefile
|
xrdp/Makefile
|
||||||
xrdpvr/Makefile
|
xrdpvr/Makefile
|
||||||
xup/Makefile
|
xup/Makefile
|
||||||
|
third_party/tomlc99/Makefile
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_REQUIRE_AUX_FILE([tap-driver.sh])
|
AC_REQUIRE_AUX_FILE([tap-driver.sh])
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
|
|||||||
-I$(top_srcdir)/common \
|
-I$(top_srcdir)/common \
|
||||||
-I$(top_srcdir)/libipm \
|
-I$(top_srcdir)/libipm \
|
||||||
-I$(top_srcdir)/libxrdp \
|
-I$(top_srcdir)/libxrdp \
|
||||||
|
-I$(top_srcdir)/third_party/tomlc99 \
|
||||||
$(IMLIB2_CFLAGS)
|
$(IMLIB2_CFLAGS)
|
||||||
|
|
||||||
XRDP_EXTRA_LIBS =
|
XRDP_EXTRA_LIBS =
|
||||||
@@ -67,6 +68,7 @@ xrdp_LDADD = \
|
|||||||
$(top_builddir)/common/libcommon.la \
|
$(top_builddir)/common/libcommon.la \
|
||||||
$(top_builddir)/libipm/libipm.la \
|
$(top_builddir)/libipm/libipm.la \
|
||||||
$(top_builddir)/libxrdp/libxrdp.la \
|
$(top_builddir)/libxrdp/libxrdp.la \
|
||||||
|
$(top_builddir)/third_party/tomlc99/libtoml.la \
|
||||||
$(IMLIB2_LIBS) \
|
$(IMLIB2_LIBS) \
|
||||||
$(XRDP_EXTRA_LIBS)
|
$(XRDP_EXTRA_LIBS)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user