INTEGRATION: CWS nojava1 (1.33.82); FILE MERGED
2004/10/19 14:40:45 haggai 1.33.82.2: RESYNC: (1.33-1.34); FILE MERGED 2004/08/16 13:44:49 cmc 1.33.82.1: #i33045# libsj2 is always needed, even without java
This commit is contained in:
parent
112e775a84
commit
fd4df272b7
1 changed files with 3 additions and 7 deletions
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.34 $
|
||||
# $Revision: 1.35 $
|
||||
#
|
||||
# last change: $Author: kz $ $Date: 2004-10-04 21:05:18 $
|
||||
# last change: $Author: hr $ $Date: 2004-11-09 11:51:36 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -122,12 +122,8 @@ SHL1STDLIBS+=\
|
|||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
$(VOSLIB) \
|
||||
$(SALLIB)
|
||||
|
||||
.IF "$(SOLAR_JAVA)" != ""
|
||||
SHL1STDLIBS+=\
|
||||
$(SALLIB) \
|
||||
$(SJLIB)
|
||||
.ENDIF # SOLAR_JAVA
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
|
||||
|
|
Loading…
Reference in a new issue