diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 17:51:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 17:51:36 +0000 |
| commit | e9dad76c7e645c71073720fe88c7431001fd851c (patch) | |
| tree | 7b12d5704155426e91ae9cd157d8b8c9c4bdc828 | |
| parent | 1dc38b782e57bcba3e00e94613c05e8aea418945 (diff) | |
INTEGRATION: CWS vq33 (1.191.18); FILE MERGED
2006/07/03 19:16:40 vq 1.191.18.3: #i66706# Move udkversion.mk from sal/inc/ to solenv/inc/.
2006/06/24 03:09:29 vq 1.191.18.2: #i66705# Remove wrong .SUFFIXES targets.
2006/06/24 02:56:10 vq 1.191.18.1: #i66531# Fix "Macro `LAST_MINOR' redefined after use" warnings.
| -rw-r--r-- | solenv/inc/settings.mk | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index c642ac2f1457..42c0a405d179 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.195 $ +# $Revision: 1.196 $ # -# last change: $Author: kz $ $Date: 2006-07-05 21:57:12 $ +# last change: $Author: obo $ $Date: 2006-07-10 18:51:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -77,35 +77,26 @@ SCRIPTEXT= .INCLUDE : product.mk .ENDIF # "$(PRODUCTNAME)"!="" -# --- set SOLARVERSION for older workspaces - -.IF "$(SOLARVERSION)"=="" -SOLARVERSION=$(SOLARVER)$/$(UPD) -.ENDIF - .INCLUDE : minor.mk .IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" + +.IF "$(SOURCEVERSION)"!="$(WORK_STAMP)" +.ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version! +WRONG_SOURCEVERSION +.ENDIF + +# Create $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk if needed %minor.mk : -.IF "$(SOURCEVERSION)"=="$(WORK_STAMP)" @+-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) >& $(NULLDEV) -.ELSE # "$(SOURCEVERSION)"=="$(WORK_STAMP)" - @+echo "#" - @+echo "#" - @+echo "# ERROR: minor.mk in solenv/inc does not match your version!" - @+echo "#" - @+echo "#" - force_dmake_to_error -.ENDIF # "$(SOURCEVERSION)"=="$(WORK_STAMP)" -.IF "$(GUI)"=="UNX" - @+tr -d "\015" < $(SOLARENV)$/inc$/minor.mk > $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk - @+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) -.ELSE # "$(GUI)"=="UNX" @+$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk >& $(NULLDEV) @+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) -.ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" +# Force creation of $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/ +# $(UPD)minor.mk could be empty as it's contents were already included from minor.mk +.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk + .IF "$(BSCLIENT)"=="TRUE" .IF "$(UPDATER)"!="YES" incorrect_settings: @@ -116,16 +107,9 @@ incorrect_settings: .ENDIF .ENDIF -.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk - -%udkversion.mk : $(PRJ)$/inc$/udkversion.mk - @+$(COPY) $(PRJ)$/inc$/udkversion.mk $@ - -.INCLUDE .IGNORE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/udkversion.mk +.INCLUDE : udkversion.mk # --- reset defined Environments -------------------- -.SUFFIXES: - ASM= AFLAGS= @@ -561,9 +545,6 @@ TARGETTHREAD=ST .ENDIF .ENDIF -# Neues Enironment setzen -.SUFFIXES : .exe .lst .lin .dll .obj .dlo .asm .lib .c .hxx .cxx .res .rc .src .srs .hlp .y .yxx .odl .idl .java .class .hid .cpp - # --- Pfade setzen ------------------------------------------------- # Output-Pfad |