diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-28 20:23:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-28 20:24:31 +0200 |
| commit | 422f6dd134fd3661a0af1595115c28836de66554 (patch) | |
| tree | 576afe69cdf300b7d2c19009a311a1d5f634a93e | |
| parent | 3ba3652eab747a2b707288d9e04db8a4d5fe8a26 (diff) | |
Bypass if no SOLAR_JAVA
| -rw-r--r-- | accessibility/bridge/source/java/makefile.mk | 8 | ||||
| -rw-r--r-- | bean/native/win32/makefile.mk | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk index 6bb380725ac0..5aeb21c112db 100644 --- a/accessibility/bridge/source/java/makefile.mk +++ b/accessibility/bridge/source/java/makefile.mk @@ -39,7 +39,7 @@ VERSIONOBJ= # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj @@ -54,17 +54,17 @@ DEF1EXPORTFILE=exports.dxp SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" $(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER) $(SHL1HEADER) : javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" diff --git a/bean/native/win32/makefile.mk b/bean/native/win32/makefile.mk index 9ccd0a0f3ccd..e05d270815a7 100644 --- a/bean/native/win32/makefile.mk +++ b/bean/native/win32/makefile.mk @@ -11,6 +11,8 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk +.IF "$(SOLAR_JAVA)" != "" + # --- Files -------------------------------------------------------- SLOFILES = \ @@ -28,6 +30,8 @@ DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= $(TARGET).dxp DEF1DES=officebean +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |