From 692c724f5e71f685c269085983828e7539274ecb Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Wed, 4 Dec 2013 12:12:01 -0200
Subject: fdo#60698: Merge odbcbase into odbc

We odbcbase is just used inside odbc library, so merge them.

Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6
---
 solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 11628ef96402..9cc207915e11 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -69,7 +69,6 @@ gb_EXTRAMERGEDLIBS := \
 	$(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,DBCONNECTIVITY,mork)) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
 	$(if $(filter-out ANDROID IOS,$(OS)),odbc) \
-	$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
 	odfflatxml \
 	offacc \
 	oox \
-- 
cgit v1.2.3