Fix circular dependency with libmerged, finally

It was there for a long time. Not a fatal error.

Change-Id: I7804de7494ad027eac6434a542ae55f8d42953e9
This commit is contained in:
Matúš Kukan
2015-02-02 20:41:21 +01:00
parent abff167453
commit 7b32c5f80f
+3 -3
View File
@@ -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