Kaydet (Commit) 7b32c5f8 authored tarafından Matúš Kukan's avatar Matúš Kukan

Fix circular dependency with libmerged, finally

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

Change-Id: I7804de7494ad027eac6434a542ae55f8d42953e9
üst abff1674
...@@ -191,9 +191,9 @@ $(eval $(call repositorymodule_serialize,\ ...@@ -191,9 +191,9 @@ $(eval $(call repositorymodule_serialize,\
$(call gb_Helper_optional,DESKTOP,swui) \ $(call gb_Helper_optional,DESKTOP,swui) \
sw sd \ sw sd \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
writerfilter cui chartcontroller chartcore oox svx \ writerfilter cui chartcontroller chartcore oox \
$(if $(MERGELIBS),merged,svxcore) \ $(if $(MERGELIBS), merged, \
xo sfx fwk svt vcl \ svx svxcore xo sfx fwk svt vcl) \
)) ))
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment