summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorSander Vesik <svesik@openoffice.org>2001-05-01 23:28:55 +0000
committerSander Vesik <svesik@openoffice.org>2001-05-01 23:28:55 +0000
commitdd07d869c8127423a104c42e34bc83b4d09c0651 (patch)
tree064da15057fb6a7f584e23ae30305fdc14b6333f /sw
parent74b00db7ebfa265923b4685a6c143393ecaa8e4e (diff)
Merge OO625B enhancements to trunk
Diffstat (limited to 'sw')
-rw-r--r--sw/util/makefile.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 0762371e0a95..3040ec15aef7 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: vg $ $Date: 2001-02-27 18:19:43 $
+# last change: $Author: svesik $ $Date: 2001-05-02 00:28:55 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -238,11 +238,15 @@ SHL2OBJS= \
$(OUT)$/slo$/swdll.obj
# $(SLO)$/.obj ^ \ nicht vergessen!
-.IF "$(OS)"!="LINUX"
+.IF "$(OS)"!="LINUX"
+.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="NETBSD"
SHL2OBJS+= \
$(SLO)$/atrfrm.obj \
$(SLO)$/fmtatr2.obj
.ENDIF
+.ENDIF
+.ENDIF
.IF "$(OS)$(CPU)"=="SOLARISS"
SHL2OBJS += $(SOLARLIBDIR)$/autorec.o