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

[Peter Foley]

 odk/CustomTarget_doxygen.mk |    2 +-
 solenv/gbuild/LinkTarget.mk |   28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit 40dbe0ffbbffcedcd820cb4ccd856a524a55d833
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Mon Apr 15 09:27:05 2013 -0400

    adapt doxygen to INSTDIR
    
    Change-Id: Iedb7f0c8e598b6b4387b0622ae5d8804a03eabb3

diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index df401f9..8820dd0 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -29,7 +29,7 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
 
 # Cygwin Doxygen needs unix paths
 DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/sal/inc/sal/log-areas.dox \
-	$(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
+	$(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
 DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT))
 DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref)
 DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc)
commit f3a0a68e878f9d9860797e4cd9e95527495e397e
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Mon Apr 15 09:16:32 2013 -0400

    Don't build unneccesary libraries twice: take two
    
    Fixed cross-compiling problem.
    
    This reverts commit 6df3de95cdbed9b68ee89bcd7402c17dc62324a5.
    
    Change-Id: I7a00ca4aff5df59cb51b820b028b8d6f3fe23ac1

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f5c16f3..44e41f2 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -452,7 +452,9 @@ $(call gb_LinkTarget_get_target,Library/%.exports) : $(gb_Library_OUTDIRLOCATION
 	$(if $(wildcard $@),true,touch $@)
 
 $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
-	$(call gb_LinkTarget__command,$@,$*)
+	$(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktargetname,$(lib)))),\
+	$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\
+	$(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) && echo invalid > $@),$(call gb_LinkTarget__command,$@,$*))
 	$(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -848,8 +850,26 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
 
 endef
 
-define gb_Linktarget__is_build_tool
-$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge rsc svidl)),$(true),$(false))
+gb_BUILD_HELPER_LIBS := basegfx \
+	reg \
+	sal \
+	salhelper \
+	store \
+	tl \
+	unoidl
+
+gb_BUILD_HELPER_TOOLS := cppumaker \
+	idlc \
+	regmerge \
+	rsc \
+	svidl
+
+define gb_LinkTarget__is_build_lib
+$(if $(filter $(1),$(foreach lib,$(gb_BUILD_HELPER_LIBS),$(call gb_Library_get_linktargetname,$(lib)))),$(true),$(false))
+endef
+
+define gb_LinkTarget__is_build_tool
+$(if $(filter $(1),$(addprefix Executable/,$(gb_BUILD_HELPER_TOOLS))),$(true),$(false))
 endef
 
 define gb_LinkTarget_use_libraries
@@ -858,7 +878,7 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar
 $$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
 endif
 
-ifeq ($(call gb_Linktarget__is_build_tool,$(1)),$(true))
+ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true))
 $(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4))
 
 else