diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-13 11:35:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-13 11:35:03 +0000 |
| commit | 62257c9bcea98928c71b0d8c0b3a0c43dde93e85 (patch) | |
| tree | e2ea428aa8301b34801a2c9839481f5e7b51fa99 /sot | |
| parent | 69cc97b795ea3150a475b07c5a694c72b96f4b9e (diff) | |
INTEGRATION: CWS visibility03 (1.5.220); FILE MERGED
2005/03/02 16:44:40 mhu 1.5.220.3: #i40092# Re-include makefile.pmk for symbol scoping.
2005/02/28 03:48:26 mnicel 1.5.220.2: Issue number: 40092
Part of symbol visibility work
2005/02/17 10:45:04 mnicel 1.5.220.1: Issue number: 40092
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/base/makefile.mk | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/sot/source/base/makefile.mk b/sot/source/base/makefile.mk index b0f3542e85dd..d4570142b1b7 100644 --- a/sot/source/base/makefile.mk +++ b/sot/source/base/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: jl $ $Date: 2001-07-30 10:22:08 $ +# last change: $Author: obo $ $Date: 2005-04-13 12:35:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,35 +64,33 @@ PRJ=..$/.. PRJNAME=sot TARGET=base -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.IF "$(COM)"=="GCC" -NOOPTFILES=\ - $(SLO)$/exchange.obj - -.ENDIF # --- Settings ----------------------------------------------------- + .INCLUDE : svpre.mk .INCLUDE : settings.mk .INCLUDE : sv.mk - +.INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- -SLOFILES= \ - $(SLO)$/factory.obj \ - $(SLO)$/object.obj \ - $(SLO)$/exchange.obj \ - $(SLO)$/filelist.obj \ - $(SLO)$/formats.obj +.IF "$(COM)"=="GCC" +NOOPTFILES= \ + $(SLO)$/exchange.obj +.ENDIF # GCC +SLOFILES= \ + $(SLO)$/factory.obj \ + $(SLO)$/object.obj \ + $(SLO)$/exchange.obj \ + $(SLO)$/filelist.obj \ + $(SLO)$/formats.obj -EXCEPTIONSFILES= $(SLO)$/formats.obj +EXCEPTIONSFILES= \ + $(SLO)$/formats.obj # --- Targets ------------------------------------------------------- - .INCLUDE : target.mk .INCLUDE : $(PRJ)$/util$/target.pmk |