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 | d6e05aac122b408be9ebd04231a6a7ac4ed1bb36 (patch) | |
| tree | 24244b8b5571ac2185a10af724146c4bce7da79e /sc/util | |
| parent | 2302d3fff5bbd5a695a6988ee435c2f4b51f2d31 (diff) | |
| parent | 6a30f2a3025a9db27d1230d9498570964cd74e3f (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/createExtPackage.pl | 6 | ||||
| -rw-r--r-- | sc/util/hidother.src | 5 | ||||
| -rw-r--r-- | sc/util/makefile.mk | 17 | ||||
| -rw-r--r-- | sc/util/makefile.pmk | 6 |
4 files changed, 13 insertions, 21 deletions
diff --git a/sc/util/createExtPackage.pl b/sc/util/createExtPackage.pl index 967ef9e34d9d..06ac16673dec 100644 --- a/sc/util/createExtPackage.pl +++ b/sc/util/createExtPackage.pl @@ -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: createExtPackage.pl,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/sc/util/hidother.src b/sc/util/hidother.src index 230bf06e1fbb..48dfebdf5c2c 100644 --- a/sc/util/hidother.src +++ b/sc/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.29 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 62373a33e7f7..43cc5c42470c 100644 --- a/sc/util/makefile.mk +++ b/sc/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.49 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -53,7 +49,10 @@ RESLIB1LIST=\ $(SRS)$/styleui.srs \ $(SRS)$/formdlgs.srs \ $(SRS)$/pagedlg.srs \ - $(SRS)$/navipi.srs + $(SRS)$/navipi.srs \ + $(SRS)$/cctrl.srs \ + $(SOLARCOMMONRESDIR)$/sfx.srs + RESLIB1NAME=sc RESLIB1IMAGES=\ @@ -79,8 +78,8 @@ SHL1STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(VCLLIB) \ @@ -185,6 +184,7 @@ SHL6STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(MSFILTERLIB) \ $(SVXLIB) \ $(BASEGFXLIB) \ @@ -213,6 +213,7 @@ DEF8NAME=$(SHL8TARGET) SHL8STDLIBS= \ $(ISCLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ @@ -277,6 +278,7 @@ LIB8OBJFILES = \ $(SLO)$/dapidata.obj \ $(SLO)$/crdlg.obj \ $(SLO)$/scuiasciiopt.obj \ + $(SLO)$/textimportoptions.obj \ $(SLO)$/scuiautofmt.obj \ $(SLO)$/dpgroupdlg.obj \ $(SLO)$/editfield.obj @@ -307,6 +309,7 @@ SHL9STDLIBS= \ $(SALLIB)\ $(BASICLIB) \ $(SFXLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ diff --git a/sc/util/makefile.pmk b/sc/util/makefile.pmk index 237d49cf8a7f..226a4dc9d811 100644 --- a/sc/util/makefile.pmk +++ b/sc/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 |