INTEGRATION: CWS ause077 (1.209.24); FILE MERGED
2007/04/17 21:15:28 hjs 1.209.24.2: RESYNC: (1.209-1.211); FILE MERGED 2007/04/17 14:24:46 hjs 1.209.24.1: #i76448# remove obsolete stuff
This commit is contained in:
parent
0152f57cff
commit
08d232fd01
1 changed files with 2 additions and 15 deletions
|
@ -4,9 +4,9 @@
|
||||||
#
|
#
|
||||||
# $RCSfile: settings.mk,v $
|
# $RCSfile: settings.mk,v $
|
||||||
#
|
#
|
||||||
# $Revision: 1.211 $
|
# $Revision: 1.212 $
|
||||||
#
|
#
|
||||||
# last change: $Author: vg $ $Date: 2007-03-26 14:16:37 $
|
# last change: $Author: rt $ $Date: 2007-04-26 13:56:54 $
|
||||||
#
|
#
|
||||||
# The Contents of this file are made available subject to
|
# The Contents of this file are made available subject to
|
||||||
# the terms of GNU Lesser General Public License Version 2.1.
|
# the terms of GNU Lesser General Public License Version 2.1.
|
||||||
|
@ -42,23 +42,10 @@ MKFILENAME:=SETTINGS.MK
|
||||||
force_dmake_to_error
|
force_dmake_to_error
|
||||||
.ENDIF
|
.ENDIF
|
||||||
|
|
||||||
.IF "$(USE_COMMENT)"!=""
|
|
||||||
.INCLUDE : comment.mak
|
|
||||||
.ENDIF
|
|
||||||
|
|
||||||
.INCLUDE .IGNORE : ooo_vendor.mk
|
.INCLUDE .IGNORE : ooo_vendor.mk
|
||||||
|
|
||||||
# --- common tool makros --------------------------------------
|
# --- common tool makros --------------------------------------
|
||||||
|
|
||||||
# only need for ancient workspaces
|
|
||||||
.IF "$(OS)"=="SOLARIS"
|
|
||||||
wrapper_override_cc_wrapper=AUTO
|
|
||||||
#wrapper_override_cc_wrapper=FALSE
|
|
||||||
wrapper_use_clean_sourcecheck=TRUE
|
|
||||||
.ENDIF # "$(OS)"=="SOLARIS"
|
|
||||||
|
|
||||||
.EXPORT : wrapper_override_cc_wrapper wrapper_use_clean_sourcecheck
|
|
||||||
|
|
||||||
# moved temporary wrapper here as it is used in unitools.mk
|
# moved temporary wrapper here as it is used in unitools.mk
|
||||||
.IF "$(USE_SHELL)"!=""
|
.IF "$(USE_SHELL)"!=""
|
||||||
use_shell*=$(USE_SHELL)
|
use_shell*=$(USE_SHELL)
|
||||||
|
|
Loading…
Reference in a new issue