diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:31:21 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:31:21 +0000 |
commit | d9bbeaf15cc7d45b93cb4be18d2f77df8b4769f3 (patch) | |
tree | b66f4e55a48607d010ec562b9c6c4f0ae779787c /sw/util | |
parent | 8e1076727c9775243ebe3ba1cf1ca76aa6bf4d5d (diff) |
INTEGRATION: CWS obo30 (1.69.96); FILE MERGED
2008/06/20 09:54:00 obo 1.69.96.2: RESYNC: (1.69-1.70); FILE MERGED
2008/06/04 13:54:01 obo 1.69.96.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'sw/util')
-rw-r--r-- | sw/util/makefile.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index b856d75053de..c002c1a18ed9 100644 --- a/sw/util/makefile.mk +++ b/sw/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.70 $ +# $Revision: 1.71 $ # # This file is part of OpenOffice.org. # @@ -300,6 +300,18 @@ LIB3OBJFILES = \ $(SLO)$/mmpreparemergepage.obj \ $(SLO)$/selectdbtabledialog.obj +.IF "$(GUI)$(COM)" == "WNTMSC" +.IF "$(ENABLE_PCH)" != "" +#target sw +SHL1OBJS += $(SLO)$/pchname.obj \ + $(SLO)$/pchname_ex.obj +#target swd +SHL2OBJS += $(SLO)$/pchname.obj \ + $(SLO)$/pchname_ex.obj +#target swui +SHL3OBJS += $(SLO)$/pchname.obj \ + $(SLO)$/pchname_ex.obj +.ENDIF # "$(ENABLE_PCH)" != "" +.ENDIF # "$(GUI)$(COM)" == "WNTMSC" .INCLUDE : target.mk - |