[Libreoffice-commits] core.git: 2 commits - solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/Library.mk         |    7 ++++++-
 solenv/gbuild/LinkTarget.mk      |    7 ++++---
 solenv/gbuild/TargetLocations.mk |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 0304f90cfc54086c3d0860ad91102fc044d1ae30
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Sep 24 20:54:04 2013 +0200

    fix --enable-mergelibs dependencies
    
    ..and create gb_BUILD_HELPER_LIBS in instdir, so that they are found
    when gb_BUILD_HELPER_TOOLS link against them.
    Altough it's ugly - we don't want them in instdir otherwise.
    
    Change-Id: Ia946eceeaf7eada0c3b42379e95af9bdbf52957f

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b40ad65..b6d2ecf 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -900,6 +900,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) : \
 
 endef
 
+# libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS
 gb_BUILD_HELPER_LIBS := basegfx \
 	cppu \
 	cppuhelper \
@@ -911,8 +912,8 @@ gb_BUILD_HELPER_LIBS := basegfx \
 	unoidl \
 	xmlreader \
 
+# tools libmerged depends on, so they link against gb_BUILD_HELPER_LIBS
 gb_BUILD_HELPER_TOOLS := cppumaker \
-	regmerge \
 	rsc \
 	svidl \
 	unoidl-check \
@@ -920,12 +921,12 @@ gb_BUILD_HELPER_TOOLS := cppumaker \
 
 # call gb_LinkTarget__is_build_lib,linktargetname
 define gb_LinkTarget__is_build_lib
-$(if $(filter $(1),$(foreach lib,$(gb_BUILD_HELPER_LIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),$(true),$(false))
+$(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(foreach lib,$(gb_BUILD_HELPER_LIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),$(true),$(false))
 endef
 
 # call gb_LinkTarget__is_build_tool,linktargetname
 define gb_LinkTarget__is_build_tool
-$(if $(filter $(1),$(foreach exe,$(gb_BUILD_HELPER_TOOLS),$(call gb_Executable__get_workdir_linktargetname,$(exe)))),$(true),$(false))
+$(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(foreach exe,$(gb_BUILD_HELPER_TOOLS),$(call gb_Executable__get_workdir_linktargetname,$(exe)))),$(true),$(false))
 endef
 
 # call gb_LinkTarget_use_libraries,linktarget,libs
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 747c50b5..f607ffe 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -397,7 +397,7 @@ define gb_Library__get_workdir_linktargetname
 Library/$(call gb_Library_get_filename,$(1))
 endef
 define gb_Library__get_linktarget_target
-$(if $(filter-out $(gb_MERGEDLIBS),$(1)),$(call gb_Library_get_install_target,$(1)),$(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)))
+$(call gb_Library_get_install_target,$(1))
 endef
 # this returns a tuple of both the linktargetname, and the target file
 define gb_Library_get_linktarget
commit 042bf3ca65df8f8729e760afffff461bc3a90836
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Sep 24 15:35:07 2013 +0200

    gb_Library__get_final_target: don't be phony target
    
    Change-Id: I299b088aebc0bb40bc395b774154d2fae1f5d669

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5eb7c2a..488f988 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -36,8 +36,12 @@ gb_Library_LAYER_DIRS := \
 	OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \
 	NONE:$(gb_Library_DLLDIR) \
 
+$(dir $(call gb_Library__get_final_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 # doesn't do anything, just used for hooking up component target
-.PHONY: $(call gb_Library__get_final_target,%)
+$(call gb_Library__get_final_target,%) :
+	touch $@
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/Library/%
@@ -92,6 +96,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_Library_DEFS) \
 )
 $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
+$(call gb_Library__get_final_target,$(1)) :| $(dir $(call gb_Library__get_final_target,$(1))).dir
 $(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1))
 $(call gb_LinkTarget_get_headers_target,$(2)) : \
 	| $(dir $(call gb_Library_get_ilib_target,$(1))).dir