summaryrefslogtreecommitdiffstats
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
commit38c0ddd4c914d046fc2e98cd09449dda84de0fbb (patch)
tree28519fef180f3bdcc45048bdbb7e70278c590f18
parent#i90774# restore the previous version (diff)
downloadcore-38c0ddd4c914d046fc2e98cd09449dda84de0fbb.tar.gz
core-38c0ddd4c914d046fc2e98cd09449dda84de0fbb.zip
CWS-TOOLING: integrate CWS ause098
-rw-r--r--saxon/makefile.mk5
-rw-r--r--stax/makefile.mk5
2 files changed, 8 insertions, 2 deletions
diff --git a/saxon/makefile.mk b/saxon/makefile.mk
index 5f207c3bd028..8b66fb5feec2 100644
--- a/saxon/makefile.mk
+++ b/saxon/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.1.2.1 $
#
# This file is part of OpenOffice.org.
#
@@ -58,6 +58,9 @@ BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj
OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar
+.ELSE # $(SOLAR_JAVA)!= ""
+nojava:
+ @echo "Not building $(PRJNAME) because Java is disabled"
.ENDIF # $(SOLAR_JAVA)!= ""
# --- Targets ------------------------------------------------------
diff --git a/stax/makefile.mk b/stax/makefile.mk
index 555c0504abda..41d2a2ba0885 100644
--- a/stax/makefile.mk
+++ b/stax/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.4.2.1 $
#
# This file is part of OpenOffice.org.
#
@@ -59,6 +59,9 @@ BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf jsr173_1.0_api.jar j
OUT2CLASS=jsr173_1.0_api.jar
+.ELSE # $(SOLAR_JAVA)!= ""
+nojava:
+ @echo "Not building $(PRJNAME) because Java is disabled"
.ENDIF # $(SOLAR_JAVA)!= ""
# --- Targets ------------------------------------------------------