[Libreoffice-commits] .: 2 commits - accessibility/bridge bean/native
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jan 28 10:26:05 PST 2011
accessibility/bridge/source/java/makefile.mk | 8 ++++----
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 9 ---------
bean/native/win32/makefile.mk | 4 ++++
3 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 22a47236c0436ee2593130e85adc577fc6adc50e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jan 28 20:23:53 2011 +0200
Remove superfluous empty lines at end
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 984f8e5..e453c77 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -207,13 +207,4 @@ static LRESULT APIENTRY OpenOfficeWndProc(
#endif
}
-
-
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1c5b33577a536b120b37857fbad009a9c5cd34ca
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jan 28 20:23:12 2011 +0200
Bypass if no SOLAR_JAVA
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk
index 6bb3807..5aeb21c 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 9ccd0a0..e05d270 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
More information about the Libreoffice-commits
mailing list