diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
| commit | a2df62e8ba738c1bc5d6550c6a920ee42649dad5 (patch) | |
| tree | b7e7df509010b327c1e6b3939db83ebb45d8830a /sd/util | |
| parent | 0f77ea10ee512a4ccf3d2f6bc11f13cab40b60d6 (diff) | |
| parent | e725e315399f527e63f919a9a6861066b1f41512 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sd/util')
| -rw-r--r-- | sd/util/hidother.hrc | 5 | ||||
| -rw-r--r-- | sd/util/hidother.src | 5 | ||||
| -rw-r--r-- | sd/util/makefile.mk | 18 | ||||
| -rw-r--r-- | sd/util/makefile.pmk | 6 |
4 files changed, 12 insertions, 22 deletions
diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc index df1258d3fa92..5169a3c2ed07 100644 --- a/sd/util/hidother.hrc +++ b/sd/util/hidother.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hidother.hrc,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/util/hidother.src b/sd/util/hidother.src index 898079e5c762..1a15c421b419 100644 --- a/sd/util/hidother.src +++ b/sd/util/hidother.src @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hidother.src,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index b8642e5951c5..719ed566c6f8 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.58 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -55,7 +51,10 @@ RESLIB1SRSFILES=\ $(SRS)$/animui.srs \ $(SRS)$/slideshow.srs \ $(SRS)$/uitable.srs \ - $(SRS)$/uiannotations.srs + $(SRS)$/view.srs \ + $(SRS)$/uiannotations.srs \ + $(SOLARCOMMONRESDIR)$/sfx.srs + # --- StarDraw DLL @@ -65,6 +64,7 @@ SHL1IMPLIB= sdi # dynamic libraries SHL1STDLIBS+= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -72,7 +72,6 @@ SHL1STDLIBS+= \ $(CPPCANVASLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ @@ -197,6 +196,7 @@ LIB4FILES= \ SHL4STDLIBS= \ $(ISDLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -248,12 +248,12 @@ SHL5LIBS = $(SLB)$/ppt.lib $(SLB)$/eppt.lib DEF5NAME=$(SHL5TARGET) SHL5STDLIBS = $(ISDLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(MSFILTERLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ $(SOTLIB) \ - $(GOODIESLIB) \ $(VCLLIB) \ $(SVLLIB) \ $(SOTLIB) \ diff --git a/sd/util/makefile.pmk b/sd/util/makefile.pmk index 3300f05484aa..0ae6fe664de7 100644 --- a/sd/util/makefile.pmk +++ b/sd/util/makefile.pmk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |