[Libreoffice-commits] core.git: RepositoryModule_host.mk

[Matúš Kukan]

 RepositoryModule_host.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7b32c5f80fa6a2408e1e30713e59adaffdf8ec58
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Jan 31 18:57:13 2015 +0100

    Fix circular dependency with libmerged, finally
    
    It was there for a long time. Not a fatal error.
    
    Change-Id: I7804de7494ad027eac6434a542ae55f8d42953e9

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 76bcea2..2d7fcb8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -191,9 +191,9 @@ $(eval $(call repositorymodule_serialize,\
 	$(call gb_Helper_optional,DESKTOP,swui) \
 	sw sd \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
-	writerfilter cui chartcontroller chartcore oox svx \
-	$(if $(MERGELIBS),merged,svxcore) \
-	xo sfx fwk svt vcl \
+	writerfilter cui chartcontroller chartcore oox \
+	$(if $(MERGELIBS), merged, \
+		svx svxcore xo sfx fwk svt vcl) \
 ))
 endif