From cefeae773f0644adbb22b131ff9e519baf058828 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 16 Apr 2013 12:58:47 +0200 Subject: Revert "do not merge public ure libraries" Does not work because cppuhelper depends on private libraries. So, either by setting URELIBS we break API or can't merge that much or need to think about it more and implement something clever. This reverts commit 75ece7acdc81d17ce26bab966e57fbca7406bf52. --- RepositoryModule_host.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'RepositoryModule_host.mk') diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a8bf87df7731..3b425d096876 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -240,7 +240,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ ifneq ($(MERGELIBS),) $(eval $(call gb_Module_add_targets,libreoffice,\ Library_merged \ - Library_urelibs \ + $(if $(URELIBS),Library_urelibs) \ )) endif -- cgit