diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-06-30 11:39:13 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-06-30 11:39:13 +0000 |
| commit | e911f0a36cab61c963f9b2abe338b6434435ba1a (patch) | |
| tree | 528b224a2ecb5d2305795941b3f00e8b6c8d9e26 /lib | |
| parent | 2516ce4d035e0620978ed537c8c8e10fd7fd7103 (diff) | |
| download | classpath-e911f0a36cab61c963f9b2abe338b6434435ba1a.tar.gz | |
* configure.ac: Move standard.omit creation after dirs are created.
Cat standard.omit.in from srcdir. Make exclude regex more explicit.
* lib/Makefile.am (EXTRA_DIST): Add standard.omit.in.
(clean-local): Remove standard.omit.
* lib/gen-classlist.sh.in: Use omit file in build dir.
* lib/standard.omit.in: Make exclude regex more explicit.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 2 | ||||
| -rw-r--r-- | lib/standard.omit.in | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 282c25579..31dd36aeb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -165,7 +165,7 @@ compile-classes: classes $(JAVA_SRCS) Makefile touch compile-classes endif -EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh +EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ glibj.zip classes.1 classes.2 \ $(top_builddir)/gnu/java/locale/LocaleData.java \ @@ -181,6 +181,7 @@ clean-local: -rm -rf META-INF -rm -rf lists -rm -f Makefile.deps + -rm -f standard.omit dist-hook: mkdir -p $(distdir) diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index ff76a22ea..c6a3a5aa5 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -66,7 +66,7 @@ if test ! "${top_builddir}" -ef "@top_srcdir@"; then fi -cat @top_srcdir@/lib/$1.omit vm.omit > tmp.omit +cat $1.omit vm.omit > tmp.omit for dir in $vm_dirlist; do if test -f $dir/$1.omit; then cat $dir/$1.omit >> tmp.omit diff --git a/lib/standard.omit.in b/lib/standard.omit.in index a518f7df8..d5437d3bd 100644 --- a/lib/standard.omit.in +++ b/lib/standard.omit.in @@ -1 +1 @@ -../gnu/test/.*$ +gnu/test/.*java$ |