diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/Package.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Tempfile.mk | 24 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 5 |
5 files changed, 11 insertions, 35 deletions
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index c4bbfabc7aac..75cb22153d91 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -567,7 +567,7 @@ $(dir $(call gb_HelpTarget_get_target,%))%/.dir : # Translation of the module's .xhp files and all used modules is done. # Also creates the list for gb_HelpTarget_get_filelist. $(call gb_HelpTarget_get_translation_target,%) : - rm -f $@ && mv $(call gb_var2file,$@.tmp,$(strip $(HELP_FILES))) $@ + $(file >$@,$(strip $(HELP_FILES))) # Translation of the module's .xhp files and all used and linked modules # is done. diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 6634649e5ade..880d13795b87 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -805,7 +805,7 @@ endef # call gb_LinkTarget__command_objectlist,linktarget define gb_LinkTarget__command_objectlist -TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\ +$(file >$(1),\ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \ @@ -819,8 +819,7 @@ TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\ $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_target,$(object))) \ $(PCHOBJS) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist)))) && \ -mv $${TEMPFILE} $(1) + $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist)))) endef @@ -893,10 +892,9 @@ define gb_LinkTarget__static_dep_x_template define gb_LinkTarget__command_dep_$(1) $$(call gb_Output_announce,LNK:$$(2).d.$(1),$$(true),DEP,1) -mkdir -p $$(dir $$(1)) && \ -TEMPFILE=$$(call gb_var2file,$$(shell $$(gb_MKTEMP)),\ - $$(call gb_LinkTarget__get_all_$(1),$$(2))) && \ - $$(call gb_Helper_replace_if_different_and_touch,$$$${TEMPFILE},$$(1)) +$$(shell mkdir -p $$(dir $$(1))) +$$(file >$$(1).tmp,$$(call gb_LinkTarget__get_all_$(1),$$(2))) +$$(call gb_Helper_replace_if_different_and_touch,$$(1).tmp,$$(1)) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 957c0e8c90a9..6f054a549875 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -81,8 +81,7 @@ $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) $(call gb_Trace_StartRange,$*,PKG) $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,$(RDEPENDS) depend(s) on package $* which does not exist.)) - rm -f $@ && \ - mv $(call gb_var2file,$@.tmp,$(sort $(FILES))) $@ + $(file >$@,$(sort $(FILES))) $(call gb_Trace_EndRange,$*,PKG) # for other targets that want to create Packages, does not register at Module diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk deleted file mode 100644 index 94dd1e88e19a..000000000000 --- a/solenv/gbuild/Tempfile.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -define gb_var2file -$(file >$(1),$(2))$(1) -endef - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 075c029b095d..f14e9f1a1ed4 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -194,7 +194,10 @@ endif include $(GBUILDDIR)/ExternalExecutable.mk include $(GBUILDDIR)/TargetLocations.mk -include $(GBUILDDIR)/Tempfile.mk + +define gb_var2file +$(file >$(1),$(2))$(1) +endef $(eval $(call gb_Helper_init_registries)) include $(SRCDIR)/Repository.mk |