Generate default.supp at compile-time, not configure-time.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8994 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index e66b4bc..f9e5735 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@
glibc-2.2-LinuxThreads-helgrind.supp \
glibc-2.X-drd.supp \
exp-ptrcheck.supp
+DEFAULT_SUPP_FILES = @DEFAULT_SUPP@
dist_val_DATA = $(SUPP_FILES) default.supp
@@ -66,7 +67,10 @@
# Ditto
endif
-default.supp: $(SUPP_FILES)
+default.supp: $(DEFAULT_SUPP_FILES)
+ echo "# This is a generated file, composed of the following suppression rules:" > default.supp
+ echo "# " $(DEFAULT_SUPP_FILES) >> default.supp
+ cat $(DEFAULT_SUPP_FILES) >> default.supp
## Preprend @PERL@ because tests/vg_regtest isn't executable
regtest: check
@@ -94,7 +98,7 @@
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(valdir)
-all-local:
+all-local: default.supp
mkdir -p $(inplacedir)
rm -f $(addprefix $(inplacedir)/,default.supp $(SUPP_FILES))
ln -s ../default.supp $(inplacedir)
diff --git a/configure.in b/configure.in
index 1c6eff8..ace0161 100644
--- a/configure.in
+++ b/configure.in
@@ -209,6 +209,10 @@
fi
+# This variable will collect the individual suppression files
+# depending on the results of autoconf
+DEFAULT_SUPP=""
+AC_SUBST(DEFAULT_SUPP)
AC_MSG_CHECKING([for a supported OS])
AC_SUBST(VG_OS)
@@ -458,10 +462,6 @@
fi
-# This variable will collect the individual suppression files
-# depending on the results of autoconf
-DEFAULT_SUPP=""
-AC_SUBST(DEFAULT_SUPP)
GLIBC_VERSION=""
@@ -1687,15 +1687,3 @@
Default supp files: ${DEFAULT_SUPP}
EOF
-
-cat<<EOF > default.supp
-# This is a generated file, composed of the following suppression rules:
-#
-# ${DEFAULT_SUPP}
-#
-
-EOF
-
-for file in ${DEFAULT_SUPP} ; do
- cat ${srcdir}/$file >> default.supp
-done