summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-09-29 02:34:58 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-09-29 02:43:29 -0500
commit4df639baacd871cb2793e75dd9721ad2ae715e20 (patch)
tree72a4c0b694cafd33d8786c2c74dc9a4d50c0f590
parent47894cdf75ffe29a3a070a884130565424af35f0 (diff)
add apache_commons to tail_build
Change-Id: I0365a5170011ad44b9a0ab8f1129a756884694d5
-rw-r--r--Module_tail_build.mk1
-rw-r--r--apache-commons/Module_apache-commons.mk (renamed from apache-commons/Module_apache_commons.mk)1
-rw-r--r--tail_build/prj/build.lst2
3 files changed, 2 insertions, 2 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index cf86f3c39c9f..a9635e11bf70 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
accessibility \
$(call gb_Helper_optional,AFMS,afms) \
animations \
+ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
apple_remote \
autodoc \
avmedia \
diff --git a/apache-commons/Module_apache_commons.mk b/apache-commons/Module_apache-commons.mk
index 07cba6a99424..a89f69e6e94b 100644
--- a/apache-commons/Module_apache_commons.mk
+++ b/apache-commons/Module_apache-commons.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,apache_commons))
ifneq ($(SOLAR_JAVA),)
-$(info "f:$(filter APACHE_COMMONS,$(BUILD_TYPE))")
ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,apache_commons,\
ExternalProject_apache_commons_codec \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 41b00d57d1e9..5e84fda48129 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
+tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL