solenv/gbuild/AllLangResTarget.mk | 2 +- solenv/gbuild/CliAssembly.mk | 2 +- solenv/gbuild/CliNativeLibrary.mk | 11 +++++++---- solenv/gbuild/InstallModuleTarget.mk | 2 +- solenv/gbuild/TargetLocations.mk | 1 + solenv/gbuild/WinResTarget.mk | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit 9d554cf886bb8b4d902aa5e755b84bbfb2d92ae8 Author: David Tardon <dtar...@redhat.com> Date: Sun Sep 23 17:17:29 2012 +0200 change the rest of deps on target-spec. var Change-Id: I8e8be3d5b419e79902847ffab74e5c50e839444c diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 27ac952..a82f98f 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -124,7 +124,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_ cp $$< $$@) ifneq ($(strip $(WITH_LANG)),) $(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) endif endef diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index d068fa5..e3a87bd 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -39,7 +39,7 @@ $(call gb_CliConfigTarget_get_target,$(1)) : CLI_CONFIG_VERSIONFILE := $(gb_CliC $(call gb_CliConfigTarget_get_target,$(1)) : $(2) $(call gb_CliConfigTarget_get_target,$(1)) : $(gb_CliConfigTarget_TARGET) -$(call gb_CliConfigTarget_get_target,$(1)) : $$(CLI_CONFIG_VERSIONFILE) +$(call gb_CliConfigTarget_get_target,$(1)) : $(gb_CliConfigTarget_VERSIONFILE_DEFAULT) $(call gb_CliConfigTarget_get_target,$(1)) :| $(dir $(call gb_CliConfigTarget_get_target,$(1))).dir endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 87909da..f5c1249 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -31,11 +31,15 @@ $(dir $(call gb_CliNativeLibraryTarget_get_target,%))%/.dir : $(call gb_CliNativeLibraryTarget_get_target,%) : $(call gb_CliNativeLibraryTarget__command,$@,$*,$<) +$(call gb_CliNativeLibraryTarget_get_external_target,%) : + touch $@ + .PHONY : $(call gb_CliNativeLibraryTarget_get_clean_target,%) $(call gb_CliNativeLibraryTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),SN ,4) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \ + $(call gb_CliNativeLibraryTarget_get_external_target,$*) \ ) define gb_CliNativeLibraryTarget_CliNativeLibraryTarget @@ -43,17 +47,15 @@ $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES := $(g $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_KEYFILE := $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY := +$(call gb_CliNativeLibraryTarget_get_external_target,$(1)) :| $(dir $(call gb_CliNativeLibraryTarget_get_target,$(1))).dir $(call gb_CliNativeLibraryTarget_get_target,$(1)) :| $(dir $(call gb_CliNativeLibraryTarget_get_target,$(1))).dir endef -# TODO gb_Library_get_target might be sufficient here. I do not know if -# #using <assembly.dll> actually does anything at compile time, or if it is -# only needed at link time. define gb_CliNativeLibraryTarget_wrap_library $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY := $(call gb_CliNativeLibraryTarget__get_library,$(2)) $(call gb_CliNativeLibraryTarget_get_target,$(1)) : $(call gb_Library_get_target,$(2)) -$(call gb_Library_get_external_headers_target,$(2)) : $$(CLI_NATIVE_ASSEMBLIES) +$(call gb_Library_get_external_headers_target,$(2)) : $(call gb_CliNativeLibraryTarget_get_external_target,$(1)) endef @@ -65,6 +67,7 @@ endef define gb_CliNativeLibraryTarget_use_assembly $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES += $(call gb_CliLibrary_get_target,$(2)) +$(call gb_CliNativeLibraryTarget_get_external_target,$(1)) : $(call gb_CliLibrary_get_target,$(2)) endef diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 5125b4c..8e63132 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -135,7 +135,7 @@ define gb_ScpMergeTarget_ScpMergeTarget $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf -$(call gb_ScpMergeTarget_get_target,$(1)) : $$(SCP_SDF) +$(call gb_ScpMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index a9de72c..fb35d9c 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -86,6 +86,7 @@ gb_CliAssembly_get_target = $(WORKDIR)/CliAssembly/$(1).done gb_CliAssemblyTarget_get_target = $(WORKDIR)/CliAssemblyTarget/$(1)$(gb_CliAssemblyTarget_POLICYEXT) gb_CliConfigTarget_get_target = $(WORKDIR)/CliConfigTarget/$(1).config gb_CliLibraryTarget_get_target = $(WORKDIR)/CliLibraryTarget/$(1)$(gb_CliLibraryTarget_EXT) +gb_CliNativeLibraryTarget_get_external_target = $(WORKDIR)/CliNativeLibraryTarget/$(1).external gb_CliNativeLibraryTarget_get_target = $(WORKDIR)/CliNativeLibraryTarget/$(1)$(gb_CliNativeLibraryTarget_EXT) gb_CliUnoApiTarget_get_target = $(WORKDIR)/CliUnoApiTarget/$(1)$(gb_CliUnoApiTarget_EXT) gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index 1731db6..cb683c2 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -79,7 +79,7 @@ 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) +$(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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits