diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-04 09:38:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-04 09:38:56 +0000 |
| commit | aa32e5ac86bf05ad56ca5abff65f8fa90c6b4935 (patch) | |
| tree | 34a5a0ae131018bda4e5c03b62fba8ab62371288 /boost | |
| parent | 352a0285747f38a52b9bec0c1189e120f19ac38b (diff) | |
INTEGRATION: CWS ause05 (1.2.8); FILE MERGED
2003/05/26 10:39:43 hjs 1.2.8.1: #14194# avoid similar problems here in advance
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/makefile.mk | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/boost/makefile.mk b/boost/makefile.mk index fd4ebdede5a7..36dff9ed0c65 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2003-03-18 18:48:37 $ +# last change: $Author: vg $ $Date: 2003-06-04 10:38:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,19 +86,12 @@ BUILD_ACTION= BUILD_FLAGS= .IF "$(GUI)"=="UNX" - .IF "$(COMNAME)"=="sunpro5" +.IF "$(BUILD_TOOLS)$/cc"=="$(shell +which cc)" CC:=$(COMPATH)$/bin$/cc CXX:=$(COMPATH)$/bin$/CC .ENDIF # "$(COMNAME)"=="sunpro5" - -.IF "$(COMNAME)"=="gcc3" -CC:=$(COMPATH)$/bin$/gcc3 -CXX:=$(COMPATH)$/bin$/g++3 -.ENDIF # "$(COMNAME)"=="gcc3" - -.EXPORT : CC CXX - +.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +which cc)" .ENDIF # --- Targets ------------------------------------------------------ @@ -111,9 +104,6 @@ all: \ .INCLUDE : target.mk .INCLUDE : tg_ext.mk -TG_DELIVER : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) - $(DELIVER) - # Since you never know what will be in a patch (for example, it may already # patch at configure level), we remove the entire package directory if a patch # is newer. @@ -121,7 +111,3 @@ $(MISC)$/remove_build.flag : $(PATCH_FILE_NAME) $(REMOVE_PACKAGE_COMMAND) +$(TOUCH) $(MISC)$/remove_build.flag -.IF "$(BUILD_SOSL)"!="" -ALLTAR : TG_DELIVER -.ENDIF - |