I've included the patches to make it include the DOM files during the build
and in the Jar files.  It would be very nice to pull the Makefiles out of
CVS and go straight Ant.  Is this in the very near future (please!)?

- Sean T.

The two new Makefiles and diffs are as follows:

xml-xerces/java/src/org/w3c/dom/events/Makefile
-------------------------------------------------------------------
include ../../../../../src/Makefile.incl
# Makefile for directory ./org/w3c/dom/events
#
# This makefile depends on the following environment variables
# already being defined:
#
#   JAVAC   Java compiler (with options)
#   RM      Host delete file command (with options)
#
# In addition, the CLASSPATH environment variable must
# include the absolute path of the base source directory.

TARGETS=\
        DocumentEvent.class\
        Event.class\
        EventException.class\
        EventListener.class\
        EventTarget.class\
        MutationEvent.class


all: dirs compile

dirs:

compile: ${TARGETS}

.SUFFIXES:

.SUFFIXES: .class .java

.java.class:
        ${JAVAC} $<

        touch ../../../../../src/classfiles_updated

clean:
        ${RM} *.class

-------------------------------------------------------------------

xml-xerces/java/src/org/w3c/dom/traversal/Makefile
-------------------------------------------------------------------
include ../../../../../src/Makefile.incl
# Makefile for directory ./org/w3c/dom/traversal
#
# This makefile depends on the following environment variables
# already being defined:
#
#   JAVAC   Java compiler (with options)
#   RM      Host delete file command (with options)
#
# In addition, the CLASSPATH environment variable must
# include the absolute path of the base source directory.

TARGETS=\
        DocumentTraversal.class\
        NodeFilter.class\
        NodeIterator.class\
        TreeWalker.class


all: dirs compile

dirs:

compile: ${TARGETS}

.SUFFIXES:

.SUFFIXES: .class .java

.java.class:
        ${JAVAC} $<

        touch ../../../../../src/classfiles_updated

clean:
        ${RM} *.class

-------------------------------------------------------------------

Index: Makefile
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/src/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile    2000/01/07 19:23:44     1.6
+++ Makefile    2000/01/11 05:11:43
@@ -121,10 +121,18 @@
        ${MKDIR} ../class/org/w3c/dom   
        ${CP}  ../src/org/w3c/dom/*.class
../class/org/w3c/dom
 
+#-src/org/w3c/dom/events
+       ${MKDIR} ../class/org/w3c/dom/events    
+       ${CP}  ../src/org/w3c/dom/events/*.class
../class/org/w3c/dom/events
+
 #-src/org/w3c/dom/html
        ${MKDIR} ../class/org/w3c/dom/html      
        ${CP}  ../src/org/w3c/dom/html/*.class
../class/org/w3c/dom/html
 
+#-src/org/w3c/dom/traversal
+       ${MKDIR} ../class/org/w3c/dom/traversal 
+       ${CP}  ../src/org/w3c/dom/traversal/*.class
../class/org/w3c/dom/traversal
+
 #-src/org/xml/sax
        ${MKDIR} ../class/org/xml/sax
        ${CP}  ../src/org/xml/sax/*.class
../class/org/xml/sax
@@ -204,15 +212,6 @@
        ${MKDIR} ../source/src/org/apache/xerces/domx
        ${CP}  ../src/org/apache/xerces/domx/*.java
../source/src/org/apache/xerces/domx
 
-#-src/org/apache/xerces/domx/traversal
-       ${MKDIR} ../source/src/org/apache/xerces/domx/traversal
-       ${CP}  ../src/org/apache/xerces/domx/traversal/*.java
../source/src/org/apache/xerces/domx/traversal
-
-#-src/org/apache/xerces/domx/events
-       ${MKDIR} ../source/src/org/apache/xerces/domx/events
-       ${CP}  ../src/org/apache/xerces/domx/events/*.java
../source/src/org/apache/xerces/domx/events
-
-
 #-src/org/apache/xerces/framework
        ${MKDIR} ../source/src/org/apache/xerces/framework
        ${CP}  ../src/org/apache/xerces/framework/*.java
../source/src/org/apache/xerces/framework
@@ -269,6 +268,18 @@
        ${MKDIR} ../source/src/org/w3c/dom      
        ${CP}  ../src/org/w3c/dom/*.java
../source/src/org/w3c/dom
 
+#-src/org/w3c/dom/events
+       ${MKDIR} ../source/src/org/w3c/dom/events       
+       ${CP}  ../src/org/w3c/dom/events/*.java
../source/src/org/w3c/dom/events
+
+#-src/org/w3c/dom/html
+       ${MKDIR} ../source/src/org/w3c/dom/html 
+       ${CP}  ../src/org/w3c/dom/html/*.java
../source/src/org/w3c/dom/html
+
+#-src/org/w3c/dom/traversal
+       ${MKDIR} ../source/src/org/w3c/dom/traversal    
+       ${CP}  ../src/org/w3c/dom/traversal/*.java
../source/src/org/w3c/dom/traversal
+
 #-src/org/xml/sax
        ${MKDIR} ../source/src/org/xml/sax
        ${CP}  ../src/org/xml/sax/*.java
../source/src/org/xml/sax
@@ -326,12 +337,6 @@
 #-src/org/apache/xerces/dom/events
        ${CP}  ../src/org/apache/xerces/dom/events/Makefile
../source/src/org/apache/xerces/dom/events
 
-#-src/org/apache/xerces/domx/traversal
-       ${CP}  ../src/org/apache/xerces/domx/traversal/Makefile
../source/src/org/apache/xerces/domx/traversal
-
-#-src/org/apache/xerces/domx/events
-       ${CP}  ../src/org/apache/xerces/domx/events/Makefile
../source/src/org/apache/xerces/domx/events
-
 #-src/org/apache/xerces/framework
        ${CP}  ../src/org/apache/xerces/framework/Makefile
../source/src/org/apache/xerces/framework
 
@@ -368,6 +373,15 @@
 
 #-src/org/w3c/dom
        ${CP}  ../src/org/w3c/dom/Makefile
../source/src/org/w3c/dom
+
+#-src/org/w3c/dom/events
+       ${CP}  ../src/org/w3c/dom/events/Makefile
../source/src/org/w3c/dom/events
+
+#-src/org/w3c/dom/html
+       ${CP}  ../src/org/w3c/dom/html/Makefile
../source/src/org/w3c/dom/html
+
+#-src/org/w3c/dom/traversal
+       ${CP}  ../src/org/w3c/dom/traversal/Makefile
../source/src/org/w3c/dom/traversal
 
 #-src/org/xml/sax
        ${CP}  ../src/org/xml/sax/Makefile
../source/src/org/xml/sax
Index: Makefile
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/src/org/w3c/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    1999/12/14 21:24:48     1.2
+++ Makefile    2000/01/11 05:12:16
@@ -16,7 +16,6 @@
 
 dirs:
        ${MAKE} -C dom
-       ${MAKE} -C dom/html
 
 compile: ${TARGETS}
 
@@ -31,6 +30,5 @@
 
 clean:
        ${MAKE} -C dom clean
-       ${MAKE} -C dom/html clean
 
 
Index: Makefile
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/src/org/w3c/dom/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    2000/01/06 22:00:09     1.2
+++ Makefile    2000/01/11 05:12:38
@@ -1,3 +1,4 @@
+include ../../../../src/Makefile.incl
 # Makefile for directory ./org/w3c/dom
 #
 # This makefile depends on the following environment variables
@@ -32,6 +33,9 @@
 all: dirs compile
 
 dirs:
+       ${MAKE} -C events
+       ${MAKE} -C html
+       ${MAKE} -C traversal
 
 compile: ${TARGETS}
 
@@ -42,6 +46,11 @@
 .java.class:
        ${JAVAC} $<
 
+       touch ../../../../src/classfiles_updated
+
 clean:
        ${RM} *.class
+       ${MAKE} -C events clean
+       ${MAKE} -C html clean
+       ${MAKE} -C traversal clean
 

Reply via email to