INTEGRATION: CWS ooo20040620 (1.2.2); FILE MERGED

2004/06/10 17:45:20 pjanik 1.2.2.1: #i27042#: Do not use -ldl on FreeBSD.

Contributed by Nakata Maho <maho@openoffice.org>.
This commit is contained in:
Rüdiger Timm 2004-07-13 16:07:08 +00:00
parent e01df3c0c9
commit baa553ce14

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: obo $ $Date: 2004-05-28 15:52:06 $
# last change: $Author: rt $ $Date: 2004-07-13 17:07:08 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -85,7 +85,11 @@ STDLIB= -lX11 -ldl -lc -lm
LINK=gcc
LINKFLAGS=
LINKFLAGSAPP=
STDLIB= -lX11 -ldl -lc -lm
.IF "$(OS)"=="FREEBSD"
STDLIB= -lX11 -lc -lm
.ELSE
STDLIB= -lX11 -ldl -lc -lm
.ENDIF # "$(OS)"=="FREEBSD"
.ENDIF # "$(OS)$(COMID)"=="GCC"
APP1NOSAL=TRUE