diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:17:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:17:21 +0000 |
| commit | 1d2ee097e5f41b3b57e907a09a21b2eb675ec382 (patch) | |
| tree | c8b599f315c9d90ca5ff831d21f0cbe956a199d3 /sd/util/makefile.mk | |
| parent | ee2ed319c7eb83b185a6659fbae4853d67efba13 (diff) | |
INTEGRATION: CWS obo30 (1.56.44); FILE MERGED
2008/06/04 09:53:03 obo 1.56.44.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'sd/util/makefile.mk')
| -rw-r--r-- | sd/util/makefile.mk | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 79f380c8b09f..b0becf1281be 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -1,14 +1,14 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.56 $ +# $Revision: 1.57 $ # # This file is part of OpenOffice.org. # @@ -175,7 +175,8 @@ SHL2STDLIBS= \ SHL2OBJS= $(SLO)$/sddetect.obj \ $(SLO)$/detreg.obj -SHL2DEPN+= makefile.mk + +SHL2DEPN+= makefile.mk # sdui SHL4TARGET= sdui$(DLLPOSTFIX) @@ -214,6 +215,21 @@ SHL4STDLIBS= \ $(VOSLIB) \ $(CANVASLIB) \ $(SALLIB) + +.IF "$(GUI)$(COM)" == "WNTMSC" +.IF "$(ENABLE_PCH)" != "" +#target sd +SHL1OBJS += $(SLO)$/pchname.obj \ + $(SLO)$/pchname_ex.obj +#target sdd +SHL2OBJS += $(SLO)$/pchname.obj \ + $(SLO)$/pchname_ex.obj +#target sdui +SHL4OBJS += $(SLO)$/pchname.obj \ + $(SLO)$/pchname_ex.obj +.ENDIF # "$(ENABLE_PCH)" != "" +.ENDIF # "$(GUI)$(COM)" == "WNTMSC" + # $(ISDLIB) is build in SHL1TARGET .IF "$(GUI)" == "UNX" SHL4DEPN=$(SHL1TARGETN) @@ -230,4 +246,3 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo Making: $@ @$(TYPE) sd.flt > $@ - |