diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-14 14:10:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-14 14:10:23 +0000 |
| commit | c5a1dc53955eecee3cef582c55a87dc429997d7d (patch) | |
| tree | 3f06615d75c72074b4086a63d58495678e63c79c /scaddins | |
| parent | a3aa355c4f2e7ab261bc5755c3f156e570f2a98f (diff) | |
#i6886#,#101685#: merge OOO_STABLE_1_PORTS (1.6-1.6.4.1) -> HEAD
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/analysis/makefile.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scaddins/source/analysis/makefile.mk b/scaddins/source/analysis/makefile.mk index 6a0a7eb81ce8..f8da5731703b 100644 --- a/scaddins/source/analysis/makefile.mk +++ b/scaddins/source/analysis/makefile.mk @@ -1,10 +1,10 @@ #************************************************************************** # -# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/scaddins/source/analysis/makefile.mk,v 1.7 2002-06-11 15:17:02 hjs Exp $ +# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/scaddins/source/analysis/makefile.mk,v 1.8 2002-08-14 15:10:23 hr Exp $ # -# $Date: 2002-06-11 15:17:02 $ -# $Author: hjs $ -# $Revision: 1.7 $ +# $Date: 2002-08-14 15:10:23 $ +# $Author: hr $ +# $Revision: 1.8 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -110,8 +110,7 @@ SLOFILES=\ $(SLO)$/financial.obj \ $(SLO)$/analysishelper.obj -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -#.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols .IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" SLOFILES+=$(SLO)$/staticmb.obj .ENDIF |