diff options
| author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
| commit | 19983279ad437894455c85276690b4e6ddb13c00 (patch) | |
| tree | 7f02889c4f2afa1dd20612d9f8b04c9a67b3500e /slideshow/util | |
| parent | f0abee5841de6206212093dc6baba524cac94d39 (diff) | |
| parent | f3329ec326be3986b00784419b884d3f07b602ec (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'slideshow/util')
| -rw-r--r-- | slideshow/util/makefile.mk | 8 | ||||
| -rw-r--r-- | slideshow/util/makefile.pmk | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index adde1895f..def425b60 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/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.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -67,7 +63,7 @@ SHL1STDLIBS= $(TOOLSLIB) \ $(CANVASTOOLSLIB) \ $(CPPCANVASLIB) \ $(UNOTOOLSLIB) \ - $(GOODIESLIB) \ + $(SVTOOLLIB) \ $(AVMEDIALIB) SHL1IMPLIB=i$(TARGET) diff --git a/slideshow/util/makefile.pmk b/slideshow/util/makefile.pmk index 362e7f862..53724522d 100644 --- a/slideshow/util/makefile.pmk +++ b/slideshow/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.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |