diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-06-16 13:38:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-06-16 13:38:39 +0000 |
| commit | 7fabecec1a379146c97dcafc1195809bb918cc3b (patch) | |
| tree | 8323141abc9e2e05d99458d7f401c678d0d9aed5 /bean/native/unix | |
| parent | a89a9769d4ce592e98797956c547a14bc2c8c33d (diff) | |
INTEGRATION: CWS cmcfixes9 (1.6.2); FILE MERGED
2005/06/14 11:36:12 cmc 1.6.2.2: #i50567# centralize in AWTLIB
2005/06/10 09:19:10 cmc 1.6.2.1: #i50567# gcj will be changing the name from libjawt to libgcjawt
Diffstat (limited to 'bean/native/unix')
| -rw-r--r-- | bean/native/unix/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bean/native/unix/makefile.mk b/bean/native/unix/makefile.mk index aaf9941ae67f..c3d47ff07e27 100644 --- a/bean/native/unix/makefile.mk +++ b/bean/native/unix/makefile.mk @@ -27,10 +27,9 @@ SLOFILES = \ SHL1TARGET=$(TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib +SHL1STDLIBS=$(AWTLIB) .IF "$(JDK)" == "gcj" -SHL1STDLIBS=-lgcjawt -lgcj -.ELSE -SHL1STDLIBS=-ljawt +SHL1STDLIBS+=-lgcj .ENDIF .IF "$(OS)" == "LINUX" |