diff options
Diffstat (limited to 'sw/util/makefile.mk')
-rw-r--r-- | sw/util/makefile.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 08afadc10698..c69cec312565 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 @@ -99,11 +95,11 @@ LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ SHL1STDLIBS+= \ $(LNGLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(SFXLIB) \ $(XMLOFFLIB) \ $(BASICLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(SVTOOLLIB) \ @@ -179,6 +175,7 @@ DEF3NAME= $(SHL3TARGET) SHL3STDLIBS= \ $(ISWLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ @@ -319,9 +316,9 @@ DEF4NAME=$(SHL4TARGET) SHL4STDLIBS= \ $(ISWLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(MSFILTERLIB) \ $(SFXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ @@ -367,8 +364,9 @@ SHL5STDLIBS= \ $(VCLLIB) \ $(TKLIB) \ $(I18NISOLANGLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(SVXMSFILTERLIB) SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib |