diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:51:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:51:36 +0000 |
| commit | fd4df272b74d572891b477e2164444c17a4cf697 (patch) | |
| tree | e273ed6b2d981a4e60b5a0aa98879aeb81c2abd0 /sfx2/util | |
| parent | 112e775a844ea029bf193b1e02a68d6bf24997d9 (diff) | |
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
Diffstat (limited to 'sfx2/util')
| -rw-r--r-- | sfx2/util/makefile.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index ff733fbab090..c51c59b95350 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -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" |