[Libreoffice-commits] .: Branch 'integration/dev300_m101' - ure/source

[Kohei Yoshida]

 ure/source/makefile.mk |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit df95286c49073bd1b1b7551360d1474c19fe823a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 15 23:00:35 2011 -0400

    Skip the java part when --without-java.

diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index bdd4365..040f539 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -41,9 +41,6 @@ my_components = \
     introspection \
     invocadapt \
     invocation \
-    javaloader \
-    javavm \
-    juh \
     namingservice \
     proxyfac \
     reflection \
@@ -53,6 +50,16 @@ my_components = \
     textoutstream \
     uuresolver
 
+.IF "$(SOLAR_JAVA)" != ""
+
+my_components = \
+    $(my_components) \
+    javaloader \
+    javavm \
+    juh
+
+.ENDIF
+
 .INCLUDE: settings.mk
 .INCLUDE: target.mk