diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 12:58:47 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 16:39:42 +0200 |
| commit | cefeae773f0644adbb22b131ff9e519baf058828 (patch) | |
| tree | 5273971f33efa7fdc70789f7460e12308102023f /RepositoryModule_host.mk | |
| parent | bf063d9dfab7ca16b1b7dff54ec9b1d47c24b997 (diff) | |
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.
Diffstat (limited to 'RepositoryModule_host.mk')
| -rw-r--r-- | RepositoryModule_host.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |