diff --git a/java/build.xml b/java/build.xml
index 9c045d676f85..caf6730c4e3b 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -71,16 +71,7 @@
-
-
-
-
-
-
-
+
@@ -96,18 +87,7 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/java/dom/build.xml b/java/dom/build.xml
new file mode 100644
index 000000000000..a8f8d2ddafad
--- /dev/null
+++ b/java/dom/build.xml
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/dom/src/Makefile.in b/java/dom/src/Makefile.in
index bc6ae23f7374..701bcc66af42 100644
--- a/java/dom/src/Makefile.in
+++ b/java/dom/src/Makefile.in
@@ -63,6 +63,9 @@ ifeq ($(OS_ARCH),Linux)
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
-ljvm -lhpi
DEFINES += -DDISABLE_JIT
+else
+ifeq ($(OS_ARCH),WINNT)
+ INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/win32/
else
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
DSO_LDOPTS += \
@@ -74,6 +77,9 @@ else
-R$(JAVAHOME)/jre/lib/sparc/native_threads \
-ljvm -lhpi
endif
+endif
+
+# ifeq (($OS_ARCH),SunOS)
EXPORTS = \
nsIJavaDOM.h
diff --git a/java/webclient/build.xml b/java/webclient/build.xml
index 953f40aa6aa9..b353927d1a04 100644
--- a/java/webclient/build.xml
+++ b/java/webclient/build.xml
@@ -219,9 +219,9 @@
-
-
+
-
-
+