summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-10-15 08:43:33 +0000
committerOliver Bolte <obo@openoffice.org>2008-10-15 08:43:33 +0000
commita24b024b3b6fa665b3e660dec386ea5f472ec09b (patch)
tree7bc04347dbc14e37dd6fc6f720559d4252ee3608 /scp2/source
parent5208ea7053255a8d4dae5dd9670dffa0eae1610e (diff)
CWS-TOOLING: integrate CWS ause098
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/makefile.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 27ac4645c1b0..882e2299faf9 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.80 $
+# $Revision: 1.77.16.3 $
#
# This file is part of OpenOffice.org.
#
@@ -36,8 +36,6 @@ PRJNAME=scp2
TARGET=ooo
TARGETTYPE=CUI
-USE_JAVAVER=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -55,9 +53,7 @@ SCPDEFS+=-DENABLE_CRASHDUMP
SCPDEFS+=-DBUILD_SPECIAL
.ENDIF
-.IF "$(JAVANUMVER)" >= "000100050000"
SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
-.ENDIF
.IF "$(PROF_EDITION)"!=""
SCPDEFS+=-DPROF_EDITION