diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-06-12 07:04:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-06-12 07:04:40 +0000 |
| commit | ee7a96972d3d55c2d34a3cff708f11bfdec41f64 (patch) | |
| tree | 966fbab25ae564a263cafd9ffb3cde1c13e6be6d /accessibility | |
| parent | a85a630ebdfb9f4fe50d0e0394a951b31cc14642 (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
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/bridge/source/java/makefile.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk index 6eefff6d8..c580957ad 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" |