diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 2 | ||||
| -rw-r--r-- | lib/standard.omit.in | 2 |
5 files changed, 20 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2006-06-30 Mark Wielaard <mark@klomp.org> + + * 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. + 2006-06-30 Roman Kennke <kennke@aicas.com> * lib/Makefile.am: Added Escher dir/jar to classpath when diff --git a/configure.ac b/configure.ac index 66b4c8bd8..3345130f7 100644 --- a/configure.ac +++ b/configure.ac @@ -746,12 +746,6 @@ fi AM_CONDITIONAL(ENABLE_LOCAL_SOCKETS, test "x$ENABLE_LOCAL_SOCKETS" = "xyes") -# Create standard.omit based on decisions we just made. -cp lib/standard.omit.in lib/standard.omit -if test x$use_escher != xtrue; then - echo gnu/java/awt/peer/x >> lib/standard.omit -fi - dnl ----------------------------------------------------------- dnl output files dnl ----------------------------------------------------------- @@ -814,3 +808,10 @@ fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh]) AC_OUTPUT + +# Create standard.omit based on decisions we just made. +cat ${srcdir}/lib/standard.omit.in > lib/standard.omit +if test x$use_escher != xtrue; then + echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit +fi + 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$ |