diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 19:30:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 19:30:08 +0000 |
| commit | acce46ec2d680d7428c023828705bc930f2c835c (patch) | |
| tree | 468abc5f4bc440ebb3d060058cf9470b5b4e0bed /desktop/util/makefile.mk | |
| parent | d748a2e10c203768c627cf18c8d281326e5d819d (diff) | |
INTEGRATION: CWS geordi2q14 (1.36.26); FILE MERGED
2004/01/29 15:20:34 hr 1.36.26.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'desktop/util/makefile.mk')
| -rw-r--r-- | desktop/util/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 98df8871da..be3f258933 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.37 $ # -# last change: $Author: obo $ $Date: 2003-12-03 11:33:47 $ +# last change: $Author: hr $ $Date: 2004-02-02 20:30:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -103,7 +103,11 @@ RCFILES=verinfo.rc # --- Linken der Applikation --------------------------------------- -.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" +.IF "$(OS)" == "MACOSX" +LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//) +.ENDIF # MACOSX + +.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, # winXX is handled like solaris for now APP1_STDPRE= |