[Libreoffice-commits] .: dbaccess/Module_dbaccess.mk svx/prj sw/prj tail_build/prj

[Tor Lillqvist]

 dbaccess/Module_dbaccess.mk |    4 ++--
 svx/prj/build.lst           |    2 +-
 sw/prj/build.lst            |    2 +-
 tail_build/prj/build.lst    |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit aca52b3cf6a4e6d965f7249a5de4e1bc40f4ba18
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 26 12:18:11 2011 +0300

    Revert "Build dbaccess and connectivity only for DESKTOP platforms for now"
    
    Nah, breaks the build for non-DESKTOP platforms anyway, as headers
    delivered there are needed elsewhere. So just keep building that stuff
    even if it presumably will not be needed on either of the non-DESKTOP
    platforms.
    
    This reverts commit 9b4212f14b11993222f933f59a93359ebc44c708.

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 74dc987..73b3e58 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Module_Module,dbaccess))
 
-$(if $(filter DESKTOP,$(BUILD_TYPE)),$(eval $(call gb_Module_add_targets,dbaccess,\
+$(eval $(call gb_Module_add_targets,dbaccess,\
     AllLangResTarget_adabasui \
     AllLangResTarget_dba \
     AllLangResTarget_dbmm \
@@ -43,7 +43,7 @@ $(if $(filter DESKTOP,$(BUILD_TYPE)),$(eval $(call gb_Module_add_targets,dbacces
     Library_sdbt \
     Package_inc \
     Package_uiconfig \
-)))
+))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	JunitTest_dbaccess_complex \
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 85d4b04..34ca30e 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,2 +1,2 @@
-sx	svx	:	sfx2 TRANSLATIONS:translations oovbaapi DESKTOP:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
+sx	svx	:	sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
 sx	svx\prj								nmake	-	all	sx_prj NULL
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 07537d6..75c602e 100644
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,2 +1,2 @@
-sw      sw      :    filter TRANSLATIONS:translations DESKTOP:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DESKTOP:dbaccess comphelper LIBXSLT:libxslt test NULL
+sw      sw      :    filter TRANSLATIONS:translations connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test NULL
 sw sw\prj nmake - all sw_prj   NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 53e4b44..16df54b 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 l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper DESKTOP:connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb      tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL