diff options
| author | Oliver Bolte <obo@openoffice.org> | 2001-01-23 11:13:55 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2001-01-23 11:13:55 +0000 |
| commit | ee4b79137d1cbe21ba208c68d4d21a4897a9d879 (patch) | |
| tree | a2e83d469b0b7f8b35370516c86fe41b991d645c /sw/util | |
| parent | 317ef896c35536630470bf7bc6928b4ee2125219 (diff) | |
#65293# double identifier when linking whith linux
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index a2cc3123fa68..d96668e44808 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: mib $ $Date: 2001-01-22 11:42:12 $ +# last change: $Author: obo $ $Date: 2001-01-23 12:13:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -236,11 +236,14 @@ SHL2DEPN= \ SHL2OBJS= \ $(OUT)$/slo$/swmodule.obj \ - $(OUT)$/slo$/swdll.obj \ - $(SLO)$/atrfrm.obj \ - $(SLO)$/fmtatr2.obj + $(OUT)$/slo$/swdll.obj # $(SLO)$/.obj ^ \ nicht vergessen! +.IF "$(OS)"!="LINUX" +SHL2OBJS+= atrfrm.obj \ + $(SLO)$/fmtatr2.obj +.ENDIF + .IF "$(OS)$(CPU)"=="SOLARISS" SHL2OBJS += $(SOLARLIBDIR)$/autorec.o .ENDIF |