Changeset 29103 in vbox

Timestamp:

May 5, 2010 6:45:27 PM (15 years ago)

Author:

vboxsync

Message:

comments and spaces.

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• java/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1130 +1130 @@
 
 #
-# Python<->XPCOM bridge.
+# Include sub-makefiles for the Python<->XPCOM and Java<->XPCOM bridges.
 #
 
 # Find the Python headers for the Python<->XPCOM bridge if enabled.
 ifdef VBOX_WITH_PYTHON
-  include $(PATH_SUB_CURRENT)/python/Makefile.kmk
-endif # VBOX_WITH_PYTHON
+ include $(PATH_SUB_CURRENT)/python/Makefile.kmk
+endif
 
 ifdef VBOX_WITH_JXPCOM
-  include $(PATH_SUB_CURRENT)/java/Makefile.kmk
-endif # VBOX_WITH_JXPCOM
+ include $(PATH_SUB_CURRENT)/java/Makefile.kmk
+endif
+
 
 #

trunk/src/libs/xpcom18a4/java/Makefile.kmk

@@ -28 +28 @@
  VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/Headers
 else
-ifeq ($(KBUILD_TARGET), linux)
- VBOX_JAVA_HOME ?= /usr/lib/jvm/java-1.5.0-sun
-endif
-ifeq ($(KBUILD_TARGET), solaris)
-# VBOX_JAVA_HOME ?= /usr/jdk/jdk1.5.0
-  VBOX_JAVA_HOME ?= /usr/java
-endif
+ ifeq ($(KBUILD_TARGET), linux)
+  VBOX_JAVA_HOME ?= /usr/lib/jvm/java-1.5.0-sun
+ endif
+ ifeq ($(KBUILD_TARGET), solaris)
+ # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.5.0
+   VBOX_JAVA_HOME ?= /usr/java
+ endif
  VBOX_JAVAC = $(VBOX_JAVA_HOME)/bin/javac
  VBOX_JAVAH = $(VBOX_JAVA_HOME)/bin/javah
@@ -53 +53 @@
  $(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_XPCOMJavaProxy.h   \
  $(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_JavaXPCOMMethods.h \
- $(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_ProfileLock.h               
+ $(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_ProfileLock.h
 
 VBoxJXpcom_TEMPLATE = XPCOM
@@ -80 +80 @@
 VBoxJXpcom_LIBS     =                         \
         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)   \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 
+        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
 
 src/nsJavaInterfaces.cpp_DEPS = $(VBOX_JXPCOM_GENH)