summaryrefslogtreecommitdiff
path: root/bean/native/unix/makefile.mk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-03-15 08:07:46 +0000
committerOliver Bolte <obo@openoffice.org>2005-03-15 08:07:46 +0000
commita3e33c331d3fee5c30da971f51af1e7e54a5311f (patch)
treedcbf5f98a71437968681df1ede3081d9e45de9ea /bean/native/unix/makefile.mk
parent9d6df2c6415e797e5d842d3121393a8bcd33c6a1 (diff)
INTEGRATION: CWS gcj3 (1.4.6); FILE MERGED
2005/03/10 10:57:16 cmc 1.4.6.2: #i44359# undo SHL1NOCHECK for gcj, confirmed with gcj guys that it's their bug 2005/03/08 12:13:16 cmc 1.4.6.1: #i44359# bean now compilable with gcj
Diffstat (limited to 'bean/native/unix/makefile.mk')
-rw-r--r--bean/native/unix/makefile.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/bean/native/unix/makefile.mk b/bean/native/unix/makefile.mk
index 9cecbfb96fd4..01424d98eab8 100644
--- a/bean/native/unix/makefile.mk
+++ b/bean/native/unix/makefile.mk
@@ -16,10 +16,6 @@ NO_BSYMBOLIC=TRUE
nojava:
@echo "Not building odk/source/OOSupport because Java has been disabled"
.ENDIF
-.IF "$(JDK)"=="gcj"
-all:
- @echo This dir cannot be build with gcj because of jawt.h
-.ENDIF
.IF "$(OS)"=="MACOSX"
dummy:
@echo "Nothing to build for OS $(OS)"
@@ -40,6 +36,10 @@ SHL1STDLIBS+=-lzip -lawt
SHL1STDLIBS+=-lstdc++
.ENDIF
+.IF "$(JDK)" == "gcj"
+SHL1STDLIBS+=-lgcj
+.ENDIF
+
NO_SHL1DESCRIPTION=TRUE
# --- Targets ------------------------------------------------------