solenv/gbuild/LinkTarget.mk | 5 ++++- solenv/gbuild/extensions/pre_MergedLibsList.mk | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-)
New commits: commit 26ae620b036432ac3b3eb1322331d2e70b4e9e0e Author: Matúš Kukan <[email protected]> Date: Mon Apr 22 13:54:09 2013 +0200 urelibs: do not merge purpenvhelper (unless mergelibs=all) Change-Id: I147d05b91d46f05461f0548000c891f89486bcc7 diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index ebcb199..c106f1f 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -187,7 +187,6 @@ gb_URELIBS := \ introspection \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ - purpenvhelper \ reflection \ reg \ sal \ @@ -195,7 +194,10 @@ gb_URELIBS := \ stocservices \ store \ unoidl \ - xmlreader + xmlreader \ + $(if $(filter ALL,$(MERGELIBS)), \ + purpenvhelper \ + ) endif commit e8520cb0509c3939d48ee2114c96fef4dc15362b Author: Matúš Kukan <[email protected]> Date: Mon Apr 22 12:43:43 2013 +0200 always build also cppu and cppuhelper libraries Otherwise auxtargets for these libraries are missing for URELIBS=TRUE Change-Id: Id07b052813609eac0cb68a651f1f976a88168c65 diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 871105e..bcd8c22 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -859,12 +859,15 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ endef gb_BUILD_HELPER_LIBS := basegfx \ + cppu \ + cppuhelper \ reg \ sal \ salhelper \ store \ tl \ - unoidl + unoidl \ + xmlreader \ gb_BUILD_HELPER_TOOLS := cppumaker \ idlc \ commit a361f263aa2ef2e946dd43951b1676aa157f2f0d Author: Matúš Kukan <[email protected]> Date: Mon Apr 22 11:48:47 2013 +0200 urelibs: add more libraries Change-Id: Ibe1e811c2ee1db93200b63023dc5922cf1ecb6ca diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index a799aaa..ebcb199 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -181,14 +181,18 @@ gb_MERGEDLIBS := \ ifneq (,$(URELIBS)) gb_URELIBS := \ + bootstrap \ cppu \ cppuhelper \ + introspection \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ purpenvhelper \ + reflection \ reg \ sal \ salhelper \ + stocservices \ store \ unoidl \ xmlreader
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
