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 /starmath/util | |
| parent | 257f1ae021145a109f184cd15105e08362abf99b (diff) | |
| parent | c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'starmath/util')
| -rw-r--r-- | starmath/util/hidother.src | 5 | ||||
| -rw-r--r-- | starmath/util/makefile.mk | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src index d11beb6f62ce..e55a97852b62 100644 --- a/starmath/util/hidother.src +++ b/starmath/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.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk index 50ef998b984a..dd8e59be3cde 100644 --- a/starmath/util/makefile.mk +++ b/starmath/util/makefile.mk @@ -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.mk,v $ -# -# $Revision: 1.20 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -56,6 +52,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ @@ -64,6 +61,7 @@ SHL1STDLIBS= \ $(TKLIB) \ $(VCLLIB) \ $(SVLLIB) \ + $(I18NPAPERLIB) \ $(SOTLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ |