diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-06 16:42:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-06 16:42:10 +0000 |
| commit | c0a62700d961b347ae131fdf7824109e5e4c52eb (patch) | |
| tree | 20ecbd68e93e29a7c50b42002f367f212fc05c53 /bean | |
| parent | 193e11853767a0fc5e7ec279f67609291a1d15f3 (diff) | |
INTEGRATION: CWS gcj5 (1.5.10); FILE MERGED
2005/06/02 07:29:34 cmc 1.5.10.1: #i50224# lib name change
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/native/unix/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bean/native/unix/makefile.mk b/bean/native/unix/makefile.mk index 01424d98e..aaf9941ae 100644 --- a/bean/native/unix/makefile.mk +++ b/bean/native/unix/makefile.mk @@ -27,7 +27,11 @@ SLOFILES = \ SHL1TARGET=$(TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib +.IF "$(JDK)" == "gcj" +SHL1STDLIBS=-lgcjawt -lgcj +.ELSE SHL1STDLIBS=-ljawt +.ENDIF .IF "$(OS)" == "LINUX" .IF "$(CPUNAME)" == "S390" @@ -36,10 +40,6 @@ SHL1STDLIBS+=-lzip -lawt SHL1STDLIBS+=-lstdc++ .ENDIF -.IF "$(JDK)" == "gcj" -SHL1STDLIBS+=-lgcj -.ENDIF - NO_SHL1DESCRIPTION=TRUE # --- Targets ------------------------------------------------------ |