summaryrefslogtreecommitdiffstats
path: root/sw/util/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'sw/util/makefile.mk')
-rw-r--r--sw/util/makefile.mk16
1 files changed, 7 insertions, 9 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index cf8b8f176e45..3018f0ad2835 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
@@ -98,11 +94,11 @@ LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \
SHL1STDLIBS+= \
$(LNGLIB) \
$(SVXCORELIB) \
+ $(EDITENGLIB) \
$(SVXLIB) \
$(SFXLIB) \
$(XMLOFFLIB) \
$(BASICLIB) \
- $(GOODIESLIB) \
$(BASEGFXLIB) \
$(DRAWINGLAYERLIB) \
$(SVTOOLLIB) \
@@ -178,6 +174,7 @@ DEF3NAME= $(SHL3TARGET)
SHL3STDLIBS= \
$(ISWLIB) \
$(SVXCORELIB) \
+ $(EDITENGLIB) \
$(SVXLIB) \
$(SFX2LIB) \
$(SVTOOLLIB) \
@@ -318,9 +315,9 @@ DEF4NAME=$(SHL4TARGET)
SHL4STDLIBS= \
$(ISWLIB) \
$(SVXCORELIB) \
+ $(EDITENGLIB) \
$(MSFILTERLIB) \
$(SFXLIB) \
- $(GOODIESLIB) \
$(BASEGFXLIB) \
$(SVTOOLLIB) \
$(TKLIB) \
@@ -366,8 +363,9 @@ SHL5STDLIBS= \
$(VCLLIB) \
$(TKLIB) \
$(I18NISOLANGLIB) \
+ $(EDITENGLIB) \
$(SVXCORELIB) \
- $(SVXMSFILTERLIB) \
+ $(SVXMSFILTERLIB)
SHL5DEPN=$(SHL1TARGETN)
SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib