Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2472
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2472/1
gbuild: do not use gb_WinResTarget_get_dep_target
Change-Id: I7a198bff62c50a74f05ac6e1508f43a14610fd0d
---
M solenv/gbuild/WinResTarget.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
3 files changed, 1 insertion(+), 86 deletions(-)
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index c280276..6bbf58e 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -17,21 +17,7 @@
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE)
-$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
-
--include $(call gb_WinResTarget_get_dep_target,$(1))
-endif
-
endef
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
- $(call gb_WinResTarget__command_dep,$@,$*,$<)
-endif
-
$(call gb_WinResTarget_get_target,%) : $(call gb_Package_get_target,solenv_inc)
$(call gb_WinResTarget__command,$@,$*,$<)
@@ -39,8 +25,7 @@
$(call gb_WinResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RC ,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_WinResTarget_get_target,$*) \
- $(call gb_WinResTarget_get_dep_target,$*))
+ rm -f $(call gb_WinResTarget_get_target,$*))
define gb_WinResTarget_set_defs
$$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs instead.)
@@ -49,27 +34,15 @@
define gb_WinResTarget_add_defs
$(call gb_WinResTarget_get_target,$(1)) : DEFS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS += $(2)
-endif
-
endef
define gb_WinResTarget__add_include
$(call gb_WinResTarget_get_target,$(1)) : INCLUDE += -I$(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE += -I$(2)
-endif
-
endef
define gb_WinResTarget_set_include
$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $(2)
-endif
endef
@@ -81,10 +54,6 @@
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
$(call gb_WinResTarget_get_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
$(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)).rc
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
-endif
endef
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 0960643..9962c7d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -353,33 +353,6 @@
$(RCFILE) )
endef
-$(eval $(call gb_Helper_make_dep_targets,\
- WinResTarget \
-))
-
-ifeq ($(gb_FULLDEPS),$(true))
-gb_WinResTarget__command_target = $(OUTDIR_FOR_BUILD)/bin/makedepend
-define gb_WinResTarget__command_dep
-$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- $(OUTDIR_FOR_BUILD)/bin/makedepend \
- $(INCLUDE) \
- $(DEFS) \
- $(RCFILE) \
- -f - \
- | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(3) \
- -v OUTDIR=$(OUTDIR)/ \
- -v WORKDIR=$(WORKDIR)/ \
- -v SRCDIR=$(SRCDIR)/ \
- > $(1))
-endef
-else
-gb_WinResTarget__command_target =
-gb_WinResTarget__command_dep =
-endif
-
# InstallModuleTarget class
define gb_InstallModuleTarget_InstallModuleTarget_platform
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index e16d738..3d4c9d5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -475,33 +475,6 @@
$(RCFILE) )
endef
-$(eval $(call gb_Helper_make_dep_targets,\
- WinResTarget \
-))
-
-ifeq ($(gb_FULLDEPS),$(true))
-gb_WinResTarget__command_target = $(OUTDIR)/bin/makedepend$(gb_Executable_EXT)
-define gb_WinResTarget__command_dep
-$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(INCLUDE) \
- $(DEFS) \
- $(RCFILE) \
- -f - \
- | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(3) \
- -v OUTDIR=$(OUTDIR)/ \
- -v WORKDIR=$(WORKDIR)/ \
- -v SRCDIR=$(SRCDIR)/ \
- > $(1))
-endef
-else
-gb_WinResTarget__command_target =
-gb_WinResTarget__command_dep =
-endif
-
# InstallModuleTarget class
define gb_InstallModuleTarget_InstallModuleTarget_platform
--
To view, visit https://gerrit.libreoffice.org/2472
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a198bff62c50a74f05ac6e1508f43a14610fd0d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan@gmail.com>
Context
- [PATCH] gbuild: do not use gb_WinResTarget_get_dep_target · via Code Review
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.