From e911f0a36cab61c963f9b2abe338b6434435ba1a Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 30 Jun 2006 11:39:13 +0000 Subject: * 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. --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'configure.ac') 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 + -- cgit v1.2.1