diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/Makefile.am | 10 | ||||
| -rw-r--r-- | libjava/Makefile.in | 16 | ||||
| -rw-r--r-- | libjava/aclocal.m4 | 4 |
4 files changed, 26 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d23e54a9b80..aab20ae92bd 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2005-08-23 Tom Tromey <tromey@redhat.com> + + * aclocal.m4, Makefile.in: Rebuilt. + * Makefile.am (property_files): Added META-INF files. + (propertyo_files): Changed definition. + ($(propertyo_files)): Updated patterns. + 2005-08-22 Tom Tromey <tromey@redhat.com> PR libgcj/22622: diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 6874e15a5ce..b0b759d3581 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -298,11 +298,15 @@ classpath/resource/java/util/iso4217.properties \ classpath/resource/gnu/java/awt/peer/gtk/font.properties \ classpath/resource/gnu/regexp/MessagesBundle_it.properties \ classpath/resource/gnu/regexp/MessagesBundle_fr.properties \ -classpath/resource/gnu/regexp/MessagesBundle.properties +classpath/resource/gnu/regexp/MessagesBundle.properties \ +classpath/resource/META-INF/services/org.xml.sax.driver \ +classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \ +classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \ +classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory -propertyo_files = $(patsubst classpath/resource/%,%,$(property_files:.properties=.properties.lo)) +propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files))) -$(propertyo_files): %.properties.lo: classpath/resource/%.properties +$(propertyo_files): %.lo: classpath/resource/% $(mkinstalldirs) `dirname $@`; \ $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 62f51fc85e8..5ab714c5a06 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -200,8 +200,8 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \ javax/transaction/xa.lo org/ietf/jgss.lo am__DEPENDENCIES_3 = gnu-java-beans.lo gnu-xml.lo javax-imageio.lo \ javax-xml.lo org-w3c.lo org-xml.lo -am__DEPENDENCIES_4 = $(patsubst \ - classpath/resource/%,%,$(property_files:.properties=.properties.lo)) +am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \ + .lo,$(property_files))) am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \ stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \ java/lang/Class.java java/lang/Object.java \ @@ -773,9 +773,13 @@ classpath/resource/java/util/iso4217.properties \ classpath/resource/gnu/java/awt/peer/gtk/font.properties \ classpath/resource/gnu/regexp/MessagesBundle_it.properties \ classpath/resource/gnu/regexp/MessagesBundle_fr.properties \ -classpath/resource/gnu/regexp/MessagesBundle.properties +classpath/resource/gnu/regexp/MessagesBundle.properties \ +classpath/resource/META-INF/services/org.xml.sax.driver \ +classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \ +classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \ +classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory -propertyo_files = $(patsubst classpath/resource/%,%,$(property_files:.properties=.properties.lo)) +propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files))) CLEANFILES = libgcj-$(gcc_version).jar \ $(all_java_deps_files) $(all_java_filelist_files) @@ -6368,7 +6372,7 @@ $(db_name): gcj-dbtool$(EXEEXT) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) -$(propertyo_files): %.properties.lo: classpath/resource/%.properties +$(propertyo_files): %.lo: classpath/resource/% $(mkinstalldirs) `dirname $@`; \ $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=) diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index af5d7760dd6..906fc0cad59 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.4 -*- Autoconf -*- +# generated automatically by aclocal 1.9.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.4])]) + [AM_AUTOMAKE_VERSION([1.9.3])]) # AM_AUX_DIR_EXPAND |