[ooo-build-commit] .: boost/makefile.mk

[Thorsten Behrens]

 boost/makefile.mk |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b47e1d7fefbf8ea524494d9294b7e0fd3a8dc504
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Oct 6 00:36:17 2010 +0200

    Fix broken win32 build in boost
    
    Make boostthreadlib depend on PREDELIVER_FLAG_FILE, otherwise
    the whole include path goodness is not working (i.e. first do the
    predeliver to wntmsci12/inc, then build thread lib)

diff --git a/boost/makefile.mk b/boost/makefile.mk
index 3d80a89..691fdff 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -116,13 +116,15 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
+.IF "$(GUI)"!="WNT"
+
 $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
 
-.IF "$(GUI)"=="WNT"
+.ELSE
 
-$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : boostthreadlib
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : boostthreadlib
 
-boostthreadlib :
+boostthreadlib : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
     cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS)
 
 .ENDIF