Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2471 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/2471/1 let rsc create dep file for all platforms Change-Id: Ic2406c548c013d381a5b22f514d4807877230251 --- M solenv/gbuild/AllLangResTarget.mk M solenv/gbuild/platform/com_GCC_class.mk M solenv/gbuild/platform/com_MSC_class.mk 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index b06a8da..9bcfd09 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -83,9 +83,6 @@ # SrsPartTarget class -# defined by platform -# gb_SrsPartTarget__command_dep - gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc) gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc) @@ -105,8 +102,7 @@ endef $(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \ - $(gb_ResTarget_RSCDEPS) $(gb_SrsPartTarget__command_target) - $(call gb_SrsPartTarget__command_dep,$*,$<) + $(gb_ResTarget_RSCDEPS) $(call gb_SrsPartTarget__command,$@,$*,$<) ifeq ($(gb_FULLDEPS),$(true)) diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 4ea1a14..8470a0c 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -170,17 +170,6 @@ $(INCLUDE)) endef -define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && cd $(SRCDIR) && \ - $(gb_GCCP) \ - -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \ - $(INCLUDE) \ - $(DEFS) \ - -c -x c++-header $(2) \ - -o $(call gb_SrsPartTarget_get_dep_target,$(1))) -endef - ifeq ($(COM_GCC_IS_CLANG),TRUE) # PrecompiledHeader class diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index e2cfc49..e16d738 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -459,29 +459,6 @@ endef -# SrsPartTarget class - -ifeq ($(gb_FULLDEPS),$(true)) -gb_SrsPartTarget__command_target = $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) -define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs,\ - $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ - $(INCLUDE) \ - $(DEFS) \ - $(2) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - > $(call gb_SrsPartTarget_get_dep_target,$(1))) -endef -else -gb_SrsPartTarget__command_target = -gb_SrsPartTarget__command_dep = -endif - # WinResTarget class gb_WinResTarget_POSTFIX :=.res -- To view, visit https://gerrit.libreoffice.org/2471 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2406c548c013d381a5b22f514d4807877230251 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan <matus.ku...@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice