diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:23:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:23:25 +0000 |
| commit | fc825eed6fae0c614158bf75c471a707549253fa (patch) | |
| tree | 91dcdbb0a3ca9770aabdb4ee99aae8ecbc8c76cd /psprint/util/makefile.mk | |
| parent | b3f166a42e3e20fbc0f60be5885719d432cd58a0 (diff) | |
INTEGRATION: CWS geordi2q11 (1.9.66); FILE MERGED
2003/12/16 14:01:58 hr 1.9.66.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'psprint/util/makefile.mk')
| -rw-r--r-- | psprint/util/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/psprint/util/makefile.mk b/psprint/util/makefile.mk index 7a48407ea68c..cc07db20b72f 100644 --- a/psprint/util/makefile.mk +++ b/psprint/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: vg $ $Date: 2003-04-15 14:34:44 $ +# last change: $Author: vg $ $Date: 2003-12-17 20:23:25 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -95,9 +95,11 @@ SHL1VERSIONMAP=libpsp_linux.map SHL1STDLIBS=$(UNOTOOLSLIB) \ $(TOOLSLIB) \ - $(JVMACCESSLIB) \ $(SALLIB) \ -lX11 +.IF "$(SOLAR_JAVA)"!="" +SHL1STDLIBS+=$(JVMACCESSLIB) +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def |