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 | 7fede8929ac21327faaf6ff874ba9d151e9c9941 (patch) | |
| tree | 86835e460bc225c527da931a820d281deee55ad2 /sw/util | |
| parent | 257f1ae021145a109f184cd15105e08362abf99b (diff) | |
| parent | c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/hidother.hrc | 5 | ||||
| -rw-r--r-- | sw/util/hidother.src | 5 | ||||
| -rw-r--r-- | sw/util/makefile.mk | 16 |
3 files changed, 9 insertions, 17 deletions
diff --git a/sw/util/hidother.hrc b/sw/util/hidother.hrc index 5b7296affae0..7b3a04e0de4f 100644 --- a/sw/util/hidother.hrc +++ b/sw/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.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/util/hidother.src b/sw/util/hidother.src index 6c1ccae91f9a..b07855af625f 100644 --- a/sw/util/hidother.src +++ b/sw/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.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index cf8b8f176e45..3018f0ad2835 100644 --- a/sw/util/makefile.mk +++ b/sw/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.74 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -98,11 +94,11 @@ LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ SHL1STDLIBS+= \ $(LNGLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(SFXLIB) \ $(XMLOFFLIB) \ $(BASICLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(SVTOOLLIB) \ @@ -178,6 +174,7 @@ DEF3NAME= $(SHL3TARGET) SHL3STDLIBS= \ $(ISWLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ @@ -318,9 +315,9 @@ DEF4NAME=$(SHL4TARGET) SHL4STDLIBS= \ $(ISWLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(MSFILTERLIB) \ $(SFXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ @@ -366,8 +363,9 @@ SHL5STDLIBS= \ $(VCLLIB) \ $(TKLIB) \ $(I18NISOLANGLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(SVXMSFILTERLIB) SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib |