diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-09 19:14:23 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-09 19:14:23 +0000 |
| commit | 6da3a8d2d1bbb5925ef41b7e61d8171c87b64ac5 (patch) | |
| tree | d283cb10bc6a847ef8b3a81e1a9939e713be32eb /libjava/Makefile.am | |
| parent | ad2320c4eccc00870a485d873432bd7cbddbfa37 (diff) | |
| download | gcc-6da3a8d2d1bbb5925ef41b7e61d8171c87b64ac5.tar.gz | |
2004-03-08 Anthony Green <green@redhat.com>
* Makefile.am: Build property resource files into libgcj.
* Makefile.in: Rebuilt.
* java/util/regex/Matcher.java, java/util/regex/Pattern.java,
java/util/regex/PatternSyntaxException.java,
gnu/regexp/CharIndexed.java,
gnu/regexp/CharIndexedCharArray.java,
gnu/regexp/CharIndexedInputStream.java,
gnu/regexp/CharIndexedReader.java,
gnu/regexp/CharIndexedString.java,
gnu/regexp/CharIndexedStringBuffer.java, gnu/regexp/RE.java,
gnu/regexp/REException.java,
gnu/regexp/REFilterInputStream.java,
gnu/regexp/REFilterReader.java, gnu/regexp/REMatch.java,
gnu/regexp/REMatchEnumeration.java, gnu/regexp/RESyntax.java,
gnu/regexp/REToken.java, gnu/regexp/RETokenAny.java,
gnu/regexp/RETokenBackRef.java, gnu/regexp/RETokenChar.java,
gnu/regexp/RETokenEnd.java, gnu/regexp/RETokenEndSub.java,
gnu/regexp/RETokenLookAhead.java,
gnu/regexp/RETokenOneOf.java, gnu/regexp/RETokenPOSIX.java,
gnu/regexp/RETokenRange.java, gnu/regexp/RETokenRepeated.java,
gnu/regexp/RETokenStart.java,
gnu/regexp/RETokenWordBoundary.java,
gnu/regexp/UncheckedRE.java: Files merged from GNU Classpath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79198 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 54a4d5b5863..f8ff9498ff4 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -156,10 +156,11 @@ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ $(extra_cc_source_files) $(java_source_files) $(built_java_source_files) libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \ $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ - $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) + $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) \ + $(propertyo_files) libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \ - $(THREADOBJS) $(PLATFORMOBJS) + $(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ @@ -374,6 +375,16 @@ all_java_source_files = \ all_java_class_files = $(all_java_source_files:.java=.class) +## Build property files into the library. +property_files = \ +gnu/regexp/MessagesBundle.properties \ +gnu/regexp/MessagesBundle_fr.properties + +propertyo_files = $(property_files:.properties=.properties.lo) + +%.properties.lo: %.properties + $(GCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"` + if ONESTEP # Compile all classfiles in one go. @@ -433,7 +444,7 @@ distclean-local: clean-nat: rm -f $(nat_files) $(x_nat_files) -SUFFIXES = .class .java .h +SUFFIXES = .class .java .h .properties .class.lo: $(GCJCOMPILE) -o $@ $< @@ -2368,6 +2379,33 @@ gnu/java/nio/charset/UTF_16Decoder.java \ gnu/java/nio/charset/UTF_16Encoder.java \ gnu/java/nio/charset/UTF_16LE.java \ gnu/java/nio/charset/UTF_8.java \ +gnu/regexp/CharIndexed.java \ +gnu/regexp/CharIndexedCharArray.java \ +gnu/regexp/CharIndexedInputStream.java \ +gnu/regexp/CharIndexedReader.java \ +gnu/regexp/CharIndexedString.java \ +gnu/regexp/CharIndexedStringBuffer.java \ +gnu/regexp/RE.java \ +gnu/regexp/REException.java \ +gnu/regexp/REFilterInputStream.java \ +gnu/regexp/REFilterReader.java \ +gnu/regexp/REMatch.java \ +gnu/regexp/REMatchEnumeration.java \ +gnu/regexp/RESyntax.java \ +gnu/regexp/REToken.java \ +gnu/regexp/RETokenAny.java \ +gnu/regexp/RETokenBackRef.java \ +gnu/regexp/RETokenChar.java \ +gnu/regexp/RETokenEnd.java \ +gnu/regexp/RETokenEndSub.java \ +gnu/regexp/RETokenLookAhead.java \ +gnu/regexp/RETokenOneOf.java \ +gnu/regexp/RETokenPOSIX.java \ +gnu/regexp/RETokenRange.java \ +gnu/regexp/RETokenRepeated.java \ +gnu/regexp/RETokenStart.java \ +gnu/regexp/RETokenWordBoundary.java \ +gnu/regexp/UncheckedRE.java \ gnu/java/security/Engine.java \ gnu/java/security/OID.java \ gnu/java/security/der/BitString.java \ |