solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit cc459ea8c1d2d398c0bad5e52591af93ebc4db38 Author: Tor Lillqvist <[email protected]> Date: Tue Feb 14 12:40:24 2012 +0200 Skip merged libraries diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index d542017..0fff77f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -467,8 +467,9 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.dll,%.ilk,$(3)) \ ) +$(if $(filter $(gb_MERGEDLIBS),$(1)),,\ $(call gb_Library_get_target,$(1)) \ -$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) +$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))) ifneq ($(ENABLE_CRASHDUMP),) $(call gb_Library_get_target,$(1)) \ @@ -480,7 +481,7 @@ endif $(call gb_Library_add_default_nativeres,$(1),$(1)/default) -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) +$(if $(filter $(gb_MERGEDLIBS),$(1)),,$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))) $(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
