[Libreoffice-commits] .: Makefile.fetch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 29 01:16:57 PST 2012


 Makefile.fetch |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3051f8be18ab878399a9850474876d4c8bd01e5d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Nov 29 10:04:31 2012 +0100

    create its own target for download..
    
    ..which is created (touched) *after* successful download of all tarballs.
    fetch.log is not a good target because we touch it along the way.
    
    Note: This is necessary only because we write pointless? date into fetch.log.
    Otherwise 'download' could be phony target, thanks to the rule being empty
    if we don't need to download anything.
    
    Change-Id: I2380ab189833e03758ddd9f9bf54be38c8fa1dbe

diff --git a/Makefile.fetch b/Makefile.fetch
index 249502d..455ab99 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -68,9 +68,9 @@ define fetch_Optional
 $(if $(filter ALL,$(DO_FETCH_TARBALLS))$(filter $1,$(fetch_BUILD_TYPE)),$2)
 endef
 
-download: $(fetch_LOGFILE)
+download: $(WORKDIR)/download
 
-$(fetch_LOGFILE): $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
+$(WORKDIR)/download: $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
 	@mkdir -p $(TARFILE_LOCATION)/tmp
 	@date >> $(fetch_LOGFILE)
 	$(foreach item, \
@@ -193,5 +193,6 @@ $(fetch_LOGFILE): $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Make
 		$(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \
 		$(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \
 	,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item),no-sum))
+	@mkdir -p $(dir $@) && touch $@
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list