* sources.am, Makefile.in: Rebuilt.

	* scripts/makemake.tcl: Scan classpath/external/relaxngDatatype.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112506 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 44 insertions, 1 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2c8ea41ce5c..50b30aff3e3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2006-03-29  Tom Tromey  <tromey@redhat.com>
 
+	* sources.am, Makefile.in: Rebuilt.
+	* scripts/makemake.tcl: Scan classpath/external/relaxngDatatype.
+
+2006-03-29  Tom Tromey  <tromey@redhat.com>
+
 	PR java/26390:
 	* testsuite/libjava.lang/pr26390.out: New file.
 	* testsuite/libjava.lang/pr26390.java: New file.
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index b32f73eb489..74e55e13d1c 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -237,7 +237,7 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
 am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-peer-swing.lo \
 	gnu-java-beans.lo gnu-javax-rmi.lo gnu-javax-sound-midi.lo \
 	gnu-xml.lo javax-imageio.lo javax-rmi.lo javax-xml.lo \
-	org-omg.lo org-w3c.lo org-xml.lo
+	org-omg.lo org-relaxng.lo org-w3c.lo org-xml.lo
 am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
 	.lo,$(property_files)))
 am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
@@ -6057,6 +6057,18 @@ classpath/org/omg/SendingContext/RunTime.java \
 classpath/org/omg/SendingContext/RunTimeOperations.java \
 classpath/org/omg/stub/java/rmi/_Remote_Stub.java
 
+org_relaxng_source_files = \
+classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+
 org_w3c_source_files = \
 classpath/external/w3c_dom/org/w3c/dom/Attr.java \
 classpath/external/w3c_dom/org/w3c/dom/CDATASection.java \
@@ -6644,6 +6656,7 @@ bc_objects = \
   javax-rmi.lo \
   javax-xml.lo \
   org-omg.lo \
+  org-relaxng.lo \
   org-w3c.lo \
   org-xml.lo
 
@@ -10445,6 +10458,11 @@ org-omg.lo: $(org_omg_source_files)
 	$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-omg.lo @org-omg.list
 	@rm -f org-omg.list
 
+org-relaxng.lo: $(org_relaxng_source_files)
+	@find classpath/lib/org/relaxng -name '*.class' > org-relaxng.list
+	$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-relaxng.lo @org-relaxng.list
+	@rm -f org-relaxng.list
+
 org-w3c.lo: $(org_w3c_source_files)
 	@find classpath/lib/org/w3c -name '*.class' > org-w3c.list
 	$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-w3c.lo @org-w3c.list
diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl
index d50b65a8a16..568a72f9d12 100755
--- a/libjava/scripts/makemake.tcl
+++ b/libjava/scripts/makemake.tcl
@@ -48,6 +48,7 @@ set package_map(gnu/java/awt/peer/qt) bc
 set package_map(gnu/javax/sound/midi) bc
 set package_map(org/xml) bc
 set package_map(org/w3c) bc
+set package_map(org/relaxng) bc
 set package_map(javax/rmi) bc
 set package_map(org/omg) bc
 set package_map(gnu/CORBA) bc
@@ -338,6 +339,7 @@ read_omit_file classpath/lib/standard.omit
 scan_packages classpath
 scan_packages classpath/external/sax
 scan_packages classpath/external/w3c_dom
+scan_packages classpath/external/relaxngDatatype
 # Now scan our own files; this will correctly override decisions made
 # when scanning classpath.
 scan_packages .
diff --git a/libjava/sources.am b/libjava/sources.am
index 4748a1b5110..ca6fff77715 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -7618,6 +7618,23 @@ org-omg.lo: $(org_omg_source_files)
 	$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-omg.lo @org-omg.list
 	@rm -f org-omg.list
 
+org_relaxng_source_files = \
+classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+
+org-relaxng.lo: $(org_relaxng_source_files)
+	@find classpath/lib/org/relaxng -name '*.class' > org-relaxng.list
+	$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-relaxng.lo @org-relaxng.list
+	@rm -f org-relaxng.list
+
 org_w3c_source_files = \
 classpath/external/w3c_dom/org/w3c/dom/Attr.java \
 classpath/external/w3c_dom/org/w3c/dom/CDATASection.java \
@@ -8216,5 +8233,6 @@ bc_objects = \
   javax-rmi.lo \
   javax-xml.lo \
   org-omg.lo \
+  org-relaxng.lo \
   org-w3c.lo \
   org-xml.lo