diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:35:37 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:35:37 +0000 |
commit | bc5170e9683e156730a3c3b15d5d2bc4337539fe (patch) | |
tree | 9a45eec6550a438bd0ea1c26277f9c3287a4af11 /sfx2/util | |
parent | 5a8578def0f6363f509105cad9e1a2eb74dc2f2b (diff) |
INTEGRATION: CWS ause036 (1.39.68); FILE MERGED
2006/05/30 11:32:30 hjs 1.39.68.2: RESYNC: (1.39-1.41); FILE MERGED
2005/11/15 15:22:08 hjs 1.39.68.1: #i50255# remove obsolete/wronge dependencies
Diffstat (limited to 'sfx2/util')
-rw-r--r-- | sfx2/util/makefile.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index a8e073c4b8..501e0b87c2 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.42 $ +# $Revision: 1.43 $ # -# last change: $Author: hr $ $Date: 2006-06-19 22:40:31 $ +# last change: $Author: ihi $ $Date: 2006-06-29 11:35:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -116,11 +116,6 @@ SHL1STDLIBS+=\ SHL1DEPN += $(shell $(FIND) $(SLO) -type f -name "*.OBJ" -print) .ENDIF -.IF "$(SOLAR_JAVA)" != "" -SHL1DEPN+= \ - $(L)$/sj.lib -.ENDIF - SHL1LIBS= $(LIB1TARGET) #SHL1OBJS= $(SLO)$/sfxdll.obj |