diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 16:07:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 16:07:08 +0000 |
| commit | baa553ce14c7171ef4bb270d09bee9706ebd0607 (patch) | |
| tree | eb7ea0f19b0ca3aa0d1065984a1a6c06c1fd81aa /odk/source | |
| parent | e01df3c0c90a27c615e38cc3ddef179a70b9f34d (diff) | |
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>.
Diffstat (limited to 'odk/source')
| -rw-r--r-- | odk/source/unoapploader/unx/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk index ce5e2826da7d..061eda59c934 100644 --- a/odk/source/unoapploader/unx/makefile.mk +++ b/odk/source/unoapploader/unx/makefile.mk @@ -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 |