Kaydet (Commit) 220dcadc authored tarafından David Tardon's avatar David Tardon

move x11_extensions to tail_build

Change-Id: I7ed368730ddba2dac28e05970c509081ecaf0e80
üst 07ab493b
......@@ -92,6 +92,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
wizards \
writerfilter \
writerperfect \
$(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)), \
x11_extensions \
) \
xmerge \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
xmlhelp) \
......
tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotest unotools ure xmlreader xsltml NULL
tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotest unotools ure xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
......@@ -28,6 +28,12 @@
$(eval $(call gb_Library_Library,vclplug_gen))
ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),)
$(eval $(call gb_Library_use_packages,vclplug_gen,\
x11_extensions_inc \
))
endif
$(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment