From f721c62c8ffd7b7737a3c7825d0f8666c8c999bb Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 6 Jun 2005 16:42:10 +0000 Subject: INTEGRATION: CWS gcj5 (1.5.10); FILE MERGED 2005/06/02 07:29:34 cmc 1.5.10.1: #i50224# lib name change --- bean/native/unix/makefile.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bean/native') diff --git a/bean/native/unix/makefile.mk b/bean/native/unix/makefile.mk index 01424d98eab8..aaf9941ae67f 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 ------------------------------------------------------ -- cgit v1.2.3