solenv/gbuild/gbuild.mk | 86 +++++++++++++++++++++++++---------------------- udm/StaticLibrary_udm.mk | 1 2 files changed, 47 insertions(+), 40 deletions(-)
New commits: commit d626b631ff9a796b8d41fab06e4faf209387780d Author: David Tardon <[email protected]> Date: Sat Sep 29 11:08:09 2012 +0200 add missing dep on cosv headers Change-Id: I444874a8b59ac82c807087fb1a1d958ab1f75b12 diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 01fe7ee..3901a45 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -10,6 +10,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) $(eval $(call gb_StaticLibrary_use_packages,udm,\ + cosv_inc \ udm_inc \ )) commit fa140733eeaf59030caa3115be4de11fb210b5b7 Author: David Tardon <[email protected]> Date: Sat Sep 29 11:05:17 2012 +0200 fix dep on internal ucpp Change-Id: I42bbb3e53aaaad0e6b7df44ec2def038ac1a31eb diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 02f8998..74b0368 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,52 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +# Set up build tools that can be either internal or system. It is +# necessary to do it before we start including gbuild class makefiles, +# so the classes can add dependencies on them. +# +# TODO: As more external modules are converted, we would need more of +# these (e.g., ICU tools). Maybe the definitions should be moved to +# RepositoryExternal.mk ? +ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) +gb_XSLTPROCTARGET := +gb_XSLTPROC := xsltproc +else +gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) +endif + +ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) +gb_XMLLINTTARGET := +gb_XMLLINT := xsltproc +else +gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) +endif + +ifeq ($(SYSTEM_PYTHON),YES) +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(OS),MACOSX) +#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in +#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME +#dirs for in-tree internal python +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(DISABLE_PYTHON),TRUE) +# Build-time python +gb_PYTHON := python +else +gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +endif + +ifneq (,$(SYSTEM_UCPP)) +gb_UCPPTARGET := +else +gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) +endif + gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions @@ -379,46 +425,6 @@ endif endef - -ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) -gb_XSLTPROCTARGET := -gb_XSLTPROC := xsltproc -else -gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) -endif - -ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) -gb_XMLLINTTARGET := -gb_XMLLINT := xsltproc -else -gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) -endif - -ifeq ($(SYSTEM_PYTHON),YES) -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(OS),MACOSX) -#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in -#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME -#dirs for in-tree internal python -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(DISABLE_PYTHON),TRUE) -# Build-time python -gb_PYTHON := python -else -gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) -endif - -ifneq (,$(SYSTEM_UCPP)) -gb_UCPPTARGET := -else -gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) -endif - .PHONY: help help: @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
