INTEGRATION: CWS ause084_DEV300 (1.222.24); FILE MERGED

2008/01/24 17:37:55 hjs 1.222.24.2: RESYNC: (1.222-1.225); FILE MERGED
2007/12/17 17:58:05 hjs 1.222.24.1: #i84663# product.mk and usage gone
This commit is contained in:
Kurt Zenker 2008-03-06 14:14:58 +00:00
parent 6439592ae6
commit 095e4e45e3

View file

@ -4,9 +4,9 @@
#
# $RCSfile: settings.mk,v $
#
# $Revision: 1.227 $
# $Revision: 1.228 $
#
# last change: $Author: kz $ $Date: 2008-03-05 16:31:49 $
# last change: $Author: kz $ $Date: 2008-03-06 15:14:58 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -58,16 +58,12 @@ ENABLE_PCH=TRUE
.INCLUDE : unitools.mk
#have SCRIPTEXT already defined in product.mk but available for all
.IF "$(GUI)"=="WNT"
SCRIPTEXT=.btm
.IF "$(USE_SHELL)"=="4NT"
SCRIPTEXT=.bat
.ELSE # "$(GUI)"=="WNT"
SCRIPTEXT=
.ENDIF # "$(GUI)"=="WNT"
.IF "$(PRODUCTNAME)"!=""
.INCLUDE : product.mk
.ENDIF # "$(PRODUCTNAME)"!=""
.INCLUDE : minor.mk
.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""