* src/mm/boehm-gc/Makefile.am, src/mm/boehm-gc/libatomic_ops/Makefile.am:

Repair make distcheck.

This is extremely fragile. It works now on my Fedora 14 box with the following build script:

CONFIGURE_ARGS="--with-java-runtime-library-prefix=$CLASSPATH_PREFIX --with-jasmin-jar=$ADDITIONAL_JARS_PATH/cup.jar:$ADDITIONAL_JARS_PATH/jasmin-sable.jar"
hg clone $SRCDIR/cacao
cd cacao
(cd src/mm/boehm-gc && sh ./autogen.sh)
(cd src/mm/boehm-gc/libatomic_ops && autoreconf)
./autogen.sh && ./configure $CONFIGURE_ARGS --enable-maintainer-mode && make -j4 || exit 1
make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"

diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am
index f386f14f11190f0b30148eab1b4ba529de16e53b..4679b05ccad47bf41807dd1f031f14adabf3b864 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -31,6 +31,7 @@
 # SUBDIRS =
 # endif
 SUBDIRS =
+DIST_SUBDIRS = libatomic_ops
 
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include

diff --git a/src/mm/boehm-gc/libatomic_ops/Makefile.am b/src/mm/boehm-gc/libatomic_ops/Makefile.am
index da64dc2baeb6cd7421f242cf2273c05ca4dc108b..f6455d66ccbec84bdc56eb1529bee267b98a1102 100644 (file)
--- a/src/mm/boehm-gc/libatomic_ops/Makefile.am
+++ b/src/mm/boehm-gc/libatomic_ops/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = src doc tests
 
 #distclean-local:
+
+dist-hook:
+       -rm $(distdir)/config.status