diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-15 08:43:33 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-15 08:43:33 +0000 |
| commit | f1fc86b9572c9321d912afc1c606ac10c1faceda (patch) | |
| tree | caa4cedd80c51fe1fb21f75a78c9d81c2efe6711 /accessibility/bridge | |
| parent | b7b0c7adee8ca6c86b5eb1ea10de2ef5d1b11d66 (diff) | |
CWS-TOOLING: integrate CWS ause098
Diffstat (limited to 'accessibility/bridge')
3 files changed, 3 insertions, 18 deletions
diff --git a/accessibility/bridge/org/openoffice/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/accessibility/makefile.mk index f1f441617a72..dc6f848fb0d3 100755 --- a/accessibility/bridge/org/openoffice/accessibility/makefile.mk +++ b/accessibility/bridge/org/openoffice/accessibility/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.24.1 $ # # This file is part of OpenOffice.org. # @@ -34,13 +34,10 @@ PRJ = ..$/..$/..$/.. TARGET = java_uno_accessbridge PACKAGE = org$/openoffice$/accessibility -USE_JAVAVER:=TRUE - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.IF "$(JAVANUMVER:s/.//)" >= "000100040000" JARFILES = jurt.jar unoil.jar ridl.jar JAVAFILES = \ AccessBridge.java \ @@ -54,7 +51,6 @@ JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) org/openoffice/java/accessibility CUSTOMMANIFESTFILE = manifest -.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" # --- Targets ------------------------------------------------------ diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk index f232e5b0afc4..d48817b51a6c 100755 --- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk +++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.26 $ +# $Revision: 1.26.4.1 $ # # This file is part of OpenOffice.org. # @@ -34,13 +34,10 @@ PRJ = ..$/..$/..$/..$/.. TARGET = java_accessibility PACKAGE = org$/openoffice$/java$/accessibility -USE_JAVAVER:=TRUE - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.IF "$(JAVANUMVER:s/.//)" >= "000100050000" JAVADIR = $(OUT)$/misc$/java JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar JAVAFILES = \ @@ -96,8 +93,6 @@ JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) -.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100050000" - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk index 013a47e4eb0d..7f81f85275df 100644 --- a/accessibility/bridge/source/java/makefile.mk +++ b/accessibility/bridge/source/java/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.24.1 $ # # This file is part of OpenOffice.org. # @@ -37,8 +37,6 @@ USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE VERSIONOBJ= -USE_JAVAVER:=TRUE - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -46,7 +44,6 @@ USE_JAVAVER:=TRUE # --- Files -------------------------------------------------------- .IF "$(GUI)"=="WNT" -.IF "$(JAVANUMVER:s/.//)" >= "000100040000" SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj @@ -62,14 +59,12 @@ DEF1EXPORTFILE=exports.dxp SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h .ENDIF # "$(GUI)"=="WNT" -.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" # --- Targets ------------------------------------------------------ .INCLUDE : target.mk .IF "$(GUI)"=="WNT" -.IF "$(JAVANUMVER:s/.//)" >= "000100040000" $(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER) @@ -77,4 +72,3 @@ $(SHL1HEADER) : javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter .ENDIF # "$(GUI)"=="WNT" -.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" |