[Libreoffice-commits] core.git: solenv/gbuild

[Peter Foley]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |   11 ++++++-----
 solenv/gbuild/gbuild.mk                        |    3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c52ceef8395a3b4c59bf6e139e126b57c77d2d92
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Mar 23 11:42:11 2013 -0400

    add dba dbu and dbtools to Library_merged
    
    Change-Id: I2a686cc18e0e965124e886901d852daf2d607b9b

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 6af96e0..e2167bc 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -33,6 +33,9 @@ gb_MERGEDLIBS := \
 	canvastools \
 	configmgr \
 	cppcanvas \
+	$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
+	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
+	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
 	deploymentmisc \
 	desktopbe1 \
 	drawinglayer \
@@ -73,13 +76,11 @@ gb_MERGEDLIBS := \
 	uui \
 	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	vcl \
-	$(if $(filter-out IOS,$(OS)), \
-	wpftdraw \
-	wpftwriter) \
+	$(if $(filter-out IOS,$(OS)),wpftdraw) \
+	$(if $(filter-out IOS,$(OS)),wpftwriter) \
 	xmlscript \
 	xmlsecurity \
-	xo \
-
+	xo
 
 ifeq ($(OS),ANDROID)
 gb_MERGEDLIBS += \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index aff848b..f914c00 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -82,6 +82,8 @@ COMMA :=,
 
 CLOSE_PAREN :=)
 
+include $(GBUILDDIR)/Helper.mk
+
 # optional extensions that should never be essential
 ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),)
 include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk)
@@ -180,7 +182,6 @@ gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
 endif
 
 include $(GBUILDDIR)/ExternalExecutable.mk
-include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 include $(GBUILDDIR)/Tempfile.mk