|
From: Jeremy F. <je...@go...> - 2004-03-12 11:02:40
|
CVS commit by fitzhardinge:
Fix "make distcheck", and also make sure that the generated archive
contains everything needed to "make regtest". Bump the version.
M +3 -3 Makefile.am 1.64
M +1 -4 configure.in 1.106
M +4 -4 addrcheck/Makefile.am 1.48
M +5 -1 addrcheck/tests/Makefile.am 1.6
M +2 -2 cachegrind/Makefile.am 1.43
M +5 -2 cachegrind/tests/Makefile.am 1.11
M +2 -2 corecheck/Makefile.am 1.42
M +5 -5 coregrind/Makefile.am 1.70
M +2 -2 example/Makefile.am 1.6
M +4 -4 helgrind/Makefile.am 1.46
M +5 -2 helgrind/tests/Makefile.am 1.6
M +2 -2 lackey/Makefile.am 1.43
M +4 -4 massif/Makefile.am 1.2
M +1 -1 massif/hp2ps/Makefile.am 1.4
M +4 -4 memcheck/Makefile.am 1.48
M +5 -2 memcheck/tests/Makefile.am 1.33
M +3 -3 none/Makefile.am 1.43
M +15 -24 none/tests/Makefile.am 1.31
--- valgrind/Makefile.am #1.63:1.64
@@ -52,6 +52,6 @@
all-local:
- mkdir -p .in_place
- rm -f $(addprefix .in_place/,default.supp $(SUPP_FILES))
- ln -s $(addprefix ../,default.supp $(SUPP_FILES)) $(top_srcdir)/.in_place
+ mkdir -p $(top_builddir)/.in_place
+ rm -f $(addprefix $(top_builddir)/.in_place/,default.supp $(SUPP_FILES))
+ ln -s $(addprefix $(top_srcdir)/../,default.supp $(SUPP_FILES)) $(top_builddir)/.in_place
--- valgrind/configure.in #1.105:1.106
@@ -2,5 +2,5 @@
AC_INIT(coregrind/vg_main.c) # give me a source file, any source file...
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(valgrind, 2.1.0)
+AM_INIT_AUTOMAKE(valgrind, 2.1.1)
AM_MAINTAINER_MODE
@@ -358,7 +358,4 @@
auxprogs/Makefile
coregrind/Makefile
- coregrind/arch/Makefile
- coregrind/arch/x86-linux/Makefile
- coregrind/arch/x86-freebsd/Makefile
coregrind/demangle/Makefile
coregrind/docs/Makefile
--- valgrind/addrcheck/Makefile.am #1.47:1.48
@@ -9,5 +9,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_addrcheck.so vgpreload_addrcheck.so
@@ -22,6 +22,6 @@
vgpreload_addrcheck_so_SOURCES =
-vgpreload_addrcheck_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_addrcheck_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_addrcheck_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_addrcheck_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
vgpreload_addrcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
@@ -29,3 +29,3 @@
mkdir -p $(inplacedir)
-rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
- ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+ ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
--- valgrind/addrcheck/tests/Makefile.am #1.5:1.6
@@ -1,7 +1,11 @@
noinst_SCRIPTS = filter_stderr
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
EXTRA_DIST = $(noinst_SCRIPTS) \
badrw.stderr.exp badrw.vgtest \
fprw.stderr.exp fprw.vgtest \
insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
- insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest
+ $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+ $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+ $(addsuffix .vgtest,$(INSN_TESTS))
--- valgrind/cachegrind/Makefile.am #1.42:1.43
@@ -7,5 +7,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
bin_SCRIPTS = cg_annotate
@@ -21,3 +21,3 @@
mkdir -p $(inplacedir)
-rm -f $(inplacedir)/$(val_PROGRAMS)
- ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+ ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
--- valgrind/cachegrind/tests/Makefile.am #1.10:1.11
@@ -1,10 +1,13 @@
noinst_SCRIPTS = filter_stderr filter_cachesim_discards
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
EXTRA_DIST = $(noinst_SCRIPTS) \
chdir.vgtest chdir.stderr.exp \
dlclose.vgtest dlclose.stderr.exp dlclose.stdout.exp \
fpu-28-108.vgtest fpu-28-108.stderr.exp \
- insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
- insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest
+ $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+ $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+ $(addsuffix .vgtest,$(INSN_TESTS))
check_PROGRAMS = \
--- valgrind/corecheck/Makefile.am #1.41:1.42
@@ -7,5 +7,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_corecheck.so
@@ -17,3 +17,3 @@
mkdir -p $(inplacedir)
-rm -f $(inplacedir)/$(val_PROGRAMS)
- ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+ ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
--- valgrind/coregrind/Makefile.am #1.69:1.70
@@ -1,9 +1,9 @@
-SUBDIRS = arch x86 demangle . docs
+SUBDIRS = x86 demangle . docs
add_includes = -I$(srcdir)/demangle -I$(top_srcdir)/include -I$(srcdir)/x86
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
AM_CPPFLAGS = $(add_includes) -DVG_LIBDIR="\"$(valdir)"\"
@@ -77,8 +77,8 @@
vg_transtab.c \
vg_ldt.c
-stage2_DEPENDENCIES = $(srcdir)/valgrind.vs $(srcdir)/x86/stage2.lds
+stage2_DEPENDENCIES = $(srcdir)/valgrind.vs x86/stage2.lds
stage2_LDFLAGS=-Wl,--export-dynamic -Wl,-e,_ume_entry -g \
-Wl,-defsym,kickstart_base=0xb8000000 \
- -Wl,-T,$(srcdir)/x86/stage2.lds \
+ -Wl,-T,x86/stage2.lds \
-Wl,-version-script $(srcdir)/valgrind.vs
stage2_LDADD= \
@@ -145,5 +145,5 @@
to=$(inplacedir)/$$(echo $$i | sed 's,libpthread.so,libpthread.so.0,'); \
rm -f $$$to; \
- ln -sf $(top_srcdir)/$(subdir)/$$i $$to; \
+ ln -sf $(top_builddir)/$(subdir)/$$i $$to; \
done
--- valgrind/example/Makefile.am #1.5:1.6
@@ -7,5 +7,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_example.so
@@ -17,4 +17,4 @@
mkdir -p $(inplacedir)
-rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
- ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+ ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
--- valgrind/helgrind/Makefile.am #1.45:1.46
@@ -7,5 +7,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_helgrind.so vgpreload_helgrind.so
@@ -15,6 +15,6 @@
vgpreload_helgrind_so_SOURCES =
-vgpreload_helgrind_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_helgrind_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_helgrind_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_helgrind_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
vgpreload_helgrind_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
@@ -26,3 +26,3 @@
mkdir -p $(inplacedir)
-rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
- ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+ ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
--- valgrind/helgrind/tests/Makefile.am #1.5:1.6
@@ -1,10 +1,13 @@
noinst_SCRIPTS = filter_stderr
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
EXTRA_DIST = $(noinst_SCRIPTS) \
allok.stderr.exp allok.vgtest \
deadlock.stderr.exp deadlock.vgtest \
inherit.stderr.exp inherit.vgtest \
- insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
- insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest \
+ $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+ $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+ $(addsuffix .vgtest,$(INSN_TESTS)) \
race.stderr.exp race.vgtest \
race2.stderr.exp race2.vgtest \
--- valgrind/lackey/Makefile.am #1.42:1.43
@@ -7,5 +7,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_lackey.so
@@ -18,3 +18,3 @@
mkdir -p $(inplacedir)
-rm -f $(inplacedir)/$(val_PROGRAMS)
- ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+ ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
--- valgrind/massif/Makefile.am #1.1:1.2
@@ -7,5 +7,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_massif.so vgpreload_massif.so
@@ -15,6 +15,6 @@
vgpreload_massif_so_SOURCES =
-vgpreload_massif_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_massif_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_massif_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
@@ -22,3 +22,3 @@
mkdir -p $(inplacedir)
-rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
- ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+ ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
--- valgrind/massif/hp2ps/Makefile.am #1.3:1.4
@@ -1,5 +1,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
AM_CPPFLAGS = $(add_includes)
--- valgrind/memcheck/Makefile.am #1.47:1.48
@@ -10,5 +10,5 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_memcheck.so vgpreload_memcheck.so
@@ -16,6 +16,6 @@
vgpreload_memcheck_so_SOURCES = \
mac_replace_strmem.c
-vgpreload_memcheck_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_memcheck_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_memcheck_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_memcheck_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
vgpreload_memcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
@@ -47,3 +47,3 @@
mkdir -p $(inplacedir)
-rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
- ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+ ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
--- valgrind/memcheck/tests/Makefile.am #1.32:1.33
@@ -8,4 +8,6 @@
filter_tronical
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
EXTRA_DIST = $(noinst_SCRIPTS) \
badaddrvalue.stderr.exp \
@@ -30,6 +32,7 @@
inits.stderr.exp inits.vgtest \
inline.stderr.exp inline.stdout.exp inline.vgtest \
- insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
- insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest \
+ $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+ $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+ $(addsuffix .vgtest,$(INSN_TESTS)) \
malloc1.stderr.exp malloc1.vgtest \
malloc2.stderr.exp malloc2.vgtest \
--- valgrind/none/Makefile.am #1.42:1.43
@@ -7,13 +7,13 @@
valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
val_PROGRAMS = vgskin_none.so
vgskin_none_so_SOURCES = nl_main.c
-vgskin_none_so_LDFLAGS = -shared -Wl,-rpath,$(top_srcdir)/coregrind
+vgskin_none_so_LDFLAGS = -shared
all-local:
mkdir -p $(inplacedir)
-rm -f $(inplacedir)/$(val_PROGRAMS)
- ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+ ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
--- valgrind/none/tests/Makefile.am #1.30:1.31
@@ -1,3 +1,6 @@
-noinst_SCRIPTS = filter_cpuid filter_none_discards filter_stderr
+noinst_SCRIPTS = filter_cpuid filter_none_discards filter_stderr filter_int gen_insn_test.pl
+
+CLEANFILES = $(addsuffix .c,$(INSN_TESTS))
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
EXTRA_DIST = $(noinst_SCRIPTS) \
@@ -17,6 +20,5 @@
discard.stderr.exp discard.stdout.exp \
discard.vgtest \
- exec-sigmask.vgtest
- exec-sigmask.stdout.exp exec-sigmask.stderr.exp \
+ exec-sigmask.vgtest exec-sigmask.stdout.exp exec-sigmask.stderr.exp \
floored.stderr.exp floored.stdout.exp \
floored.vgtest \
@@ -26,13 +28,10 @@
fucomip.stderr.exp fucomip.vgtest \
gxx304.stderr.exp gxx304.vgtest \
- insn_basic.stderr.exp insn_basic.stdout.exp insn_basic.vgtest \
- insn_cmov.stderr.exp insn_cmov.stdout.exp insn_cmov.vgtest \
- insn_mmx.stderr.exp insn_mmx.stdout.exp insn_mmx.vgtest \
- insn_mmxext.stderr.exp insn_mmxext.stdout.exp insn_mmxext.vgtest \
- insn_sse.stderr.exp insn_sse.stdout.exp insn_sse.vgtest \
- insn_sse2.stderr.exp insn_sse2.stdout.exp insn_sse2.vgtest \
+ $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+ $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+ $(addsuffix .vgtest,$(INSN_TESTS)) \
int.stderr.exp int.stdout.exp int.vgtest \
- map_unmap.stdout.exp map_unmap.vgtest \
- mremap.stdout.exp mremap.vgtest \
+ map_unmap.stderr.exp map_unmap.stdout.exp map_unmap.vgtest \
+ mremap.stderr.exp mremap.stdout.exp mremap.vgtest \
munmap_exe.stderr.exp munmap_exe.vgtest \
pth_blockedsig.stderr.exp \
@@ -53,11 +52,11 @@
syscall-restart1.vgtest syscall-restart1.stdout.exp syscall-restart1.stderr.exp \
syscall-restart2.vgtest syscall-restart2.stdout.exp syscall-restart2.stderr.exp \
- system.stdout.exp system.vgtest
- yield.stdout.exp yield.vgtest
+ system.stderr.exp system.vgtest \
+ yield.stderr.exp yield.stdout.exp yield.vgtest
check_PROGRAMS = \
args bitfield1 bt_everything bt_literal closeall coolo_strlen \
cpuid dastest discard exec-sigmask floored fork fpu_lazy_eflags \
- fucomip insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2 \
+ fucomip $(INSN_TESTS) \
int munmap_exe map_unmap mremap rcl_assert \
rcrl readline1 resolv seg_override sha1_test shortpush shorts smc1 \
@@ -138,12 +137,4 @@
fpu_lazy_eflags.o: CFLAGS += -O2 -mcpu=pentiumpro -march=pentiumpro
-# rebuild instruction tests if test generator changes
-insn_basic.c: gen_insn_test.pl
-insn_cmov.c: gen_insn_test.pl
-insn_mmx.c: gen_insn_test.pl
-insn_mmxext.c: gen_insn_test.pl
-insn_sse.c: gen_insn_test.pl
-insn_sse2.c: gen_insn_test.pl
-
-.def.c:
- $(PERL) gen_insn_test.pl < $< > $@
+.def.c: $(srcdir)/gen_insn_test.pl
+ $(PERL) $(srcdir)/gen_insn_test.pl < $< > $@
|