[Libreoffice-commits] .: Makefile

Peter Foley pefoley2 at kemper.freedesktop.org
Wed Mar 7 07:41:52 PST 2012


 Makefile |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 5b2b793caeed16e5d7d63cb5ce8a07289051dca8
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Mar 6 17:43:07 2012 -0500

    fix make dependencies for windows

diff --git a/Makefile b/Makefile
index 5da1387..905829b 100644
--- a/Makefile
+++ b/Makefile
@@ -341,12 +341,19 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
 # but I couldn't find a way to get make to
 # restart after an autogen. and we _have_ to
 # restart since autogen can have changed
-# config_host.k which is included in this
+# config_host.mk which is included in this
 # Makefile
-Makefile: $(SRCDIR)/config_host.mk
+
+ifeq ($(OS_FOR_BUILD),WNT)
+CONFIG_HOST_MK=$(shell cygpath -u $(SRCDIR))/config_host.mk
+else
+CONFIG_HOST_MK=$(SRCDIR)/config_host.mk
+endif
+
+Makefile: $(CONFIG_HOST_MK)
 	touch $@
 
-$(SRCDIR)/config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun
+$(CONFIG_HOST_MK) : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun
 	./autogen.sh
 
 autogen.lastrun:


More information about the Libreoffice-commits mailing list