diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-20 12:04:29 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-20 16:28:54 +0200 |
| commit | 220dcadca1dad5e5b872371c5a4110e244d4e944 (patch) | |
| tree | fd7b766bb0cf332db85d48e7a55b5b318726090e | |
| parent | gbuildize x11_extensions (diff) | |
| download | core-220dcadca1dad5e5b872371c5a4110e244d4e944.tar.gz core-220dcadca1dad5e5b872371c5a4110e244d4e944.zip | |
move x11_extensions to tail_build
Change-Id: I7ed368730ddba2dac28e05970c509081ecaf0e80
| -rw-r--r-- | Module_tail_build.mk | 3 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 56ad548b2e79..b37a45d43c93 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -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) \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index bb50d8b4ca19..b3afe4f23c8d 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -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 diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 3ff257a0ce60..50c0c6469664 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -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 \ |