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 /Repository.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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 26556af6896c..15c34813c550 100644 --- a/Repository.mk +++ b/Repository.mk @@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ $(if $(SOLAR_JAVA),sunjavaplugin) \ unoidl \ unsafe_uno \ - $(if $(MERGELIBS),urelibs) \ + $(if $(URELIBS),urelibs) \ xmlreader \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ )) |