summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2003-06-12 07:04:40 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2003-06-12 07:04:40 +0000
commitfc6ed35238067a3a868e699b210692b779b23a06 (patch)
treec0dbb0e92ff2044a494a8eb2faceb95ee2733a8f
parentd01b7b910b5b40ef180fc96660b7607acaafd8bf (diff)
INTEGRATION: CWS uaa04 (1.2.2); FILE MERGED
2003/06/03 15:18:21 obr 1.2.2.2: switched to JAVANUMVER 2003/05/27 05:54:13 obr 1.2.2.1: added java version check since WindowsAccessBridgeAdapter.h is generated via javah
-rw-r--r--accessibility/bridge/source/java/makefile.mk13
1 files changed, 12 insertions, 1 deletions
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk
index 6eefff6d855d..c580957adac8 100644
--- a/accessibility/bridge/source/java/makefile.mk
+++ b/accessibility/bridge/source/java/makefile.mk
@@ -64,6 +64,8 @@ USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
VERSIONOBJ=
+USE_JAVAVER:=TRUE
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -71,6 +73,7 @@ VERSIONOBJ=
# --- Files --------------------------------------------------------
.IF "$(GUI)"=="WNT"
+.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj
@@ -85,13 +88,21 @@ DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h
-.ENDIF
+
+.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000"
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+.IF "$(GUI)"=="WNT"
+.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
+
$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER)
$(SHL1HEADER) :
+ javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+
+.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000"