[Libreoffice-commits] .: Makefile.in solenv/gbuild

[Bjoern Michaelsen]

 Makefile.in                                     |   10 ++--------
 solenv/gbuild/extensions/post_BuildplTargets.mk |    6 +++---
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit cb4dbf934a2095422289723ed73a4d7cacb56afe
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Nov 28 19:22:48 2011 +0100

    some consistent naming cant hurt: cross-build-toolset -> cross_toolset

diff --git a/Makefile.in b/Makefile.in
index b6d06e6..5ae3d96 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,13 +2,7 @@
 
 SHELL=/usr/bin/env bash
 
-ifeq (@CROSS_COMPILING@,YES)
-CROSS_TOOLSET_RULE:=cross-build-toolset
-else
-CROSS_TOOLSET_RULE:=
-endif
-
-.PHONY : build dev-install all cross-build-toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap
+.PHONY : build dev-install all cross_toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap
 
 define forward_to_gbuild
 @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \
@@ -50,7 +44,7 @@ build: Makefile
 dev-install: Makefile
 	@$(call forward_to_gbuild,$@)
 
-cross-build-toolset:
+cross_toolset:
 	@$(call forward_to_gbuild,$@)
 
 clean:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1fa6a2b..cba5b33 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -55,13 +55,13 @@ endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
 
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 	$(call gb_BuildplTarget_command,$@)
 
-instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 	$(call gb_BuildplTarget_command,$@)
 
-cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
 	$(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native