diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-30 14:53:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:33:59 +0200 |
| commit | 7d6eb69950df97a12fc723bada1eb7c1839740ca (patch) | |
| tree | 2a0c5971a0df8722aeeb14473fabb18f6bdf4992 /solenv | |
| parent | 30bcb7fb1706b405577417625ed3855485936d0b (diff) | |
rename functions for consistency with the rest of gbuild
Change-Id: I572a8a6dc9da4f63b7c937748b3013bab60bb6bb
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/WinResTarget.mk | 25 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 |
3 files changed, 23 insertions, 12 deletions
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index b3c5b68126bc..97050236a8ea 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -43,8 +43,12 @@ $(call gb_WinResTarget_get_clean_target,%) : rm -f $(call gb_WinResTarget_get_target,$*)) define gb_WinResTarget_set_defs -$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(2) -$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $(2) +$$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs instead.) +endef + +define gb_WinResTarget_add_defs +$(call gb_WinResTarget_get_target,$(1)) : DEFS += $(2) +$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS += $(2) endef @@ -54,14 +58,23 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2) endef define gb_WinResTarget_add_file -$(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 +$$(call gb_Output_error,gb_WinResTarget_add_file: use gb_WinResTarget_set_rcfile instead.) +endef + +define gb_WinResTarget_set_rcfile +$(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)) : $$(RCFILE) endef define gb_WinResTarget_add_dependency -$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(SRCDIR)/$(file)) +$(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)) + +endef + +define gb_WinResTarget_add_dependencies +$(foreach dep,$(2),$(call gb_WinResTarget_add_dependency,$(1),$(dep))) endef diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index ed82b8fd9912..7c25c8b4ece3 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -314,9 +314,8 @@ endef define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) -$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) -$(call gb_WinResTarget_set_defs,$(2),\ - $$(DEFS) \ +$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) +$(call gb_WinResTarget_add_defs,$(2),\ -DVERVARIANT="$(BUILD)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DADDITIONAL_VERINFO1="" \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 21a93d08e609..ee340c71cad3 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -488,9 +488,8 @@ endef define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) -$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) -$(call gb_WinResTarget_set_defs,$(2),\ - $$(DEFS) \ +$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) +$(call gb_WinResTarget_add_defs,$(2),\ -DVERVARIANT="$(BUILD)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DORG_NAME="$(call gb_Library_get_dllname,$(1))"\ |