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 | 18895204b0169bf07236499248a218e82a72dff3 (patch) | |
tree | 8619ddf932c487cd1512f78d9e253b7490e34b51 /svtools/util | |
parent | e1577335e0c88e269995ff9164da981d800eb6bb (diff) | |
parent | 0768a7d2726ce4f0772b52d95eeb23143336655c (diff) |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'svtools/util')
-rw-r--r-- | svtools/util/hidother.src | 5 | ||||
-rw-r--r-- | svtools/util/makefile.mk | 9 | ||||
-rw-r--r-- | svtools/util/svt.pmk | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src index 7fd1dadeb09f..77dd98115221 100644 --- a/svtools/util/hidother.src +++ b/svtools/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.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index bb754b239ff3..c51a514c78f5 100644 --- a/svtools/util/makefile.mk +++ b/svtools/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.67 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -61,6 +57,7 @@ LIB1FILES= \ $(SLB)$/edit.lib \ $(SLB)$/filter.lib \ $(SLB)$/filter.uno.lib \ + $(SLB)$/graphic.lib \ $(SLB)$/igif.lib \ $(SLB)$/jpeg.lib \ $(SLB)$/ixpm.lib \ diff --git a/svtools/util/svt.pmk b/svtools/util/svt.pmk index 5f36197ce089..24d898f030c1 100644 --- a/svtools/util/svt.pmk +++ b/svtools/util/svt.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: svt.pmk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |