From: Jeremy Fitzhardinge Date: Fri, 12 Mar 2004 10:51:39 +0000 (+0000) Subject: Fix "make distcheck", and also make sure that the generated archive X-Git-Tag: svn/VALGRIND_2_1_1~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82aaa16ef92ccb107b99d683f82a117afdfa7b58;p=thirdparty%2Fvalgrind.git Fix "make distcheck", and also make sure that the generated archive contains everything needed to "make regtest". Bump the version. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2308 --- diff --git a/Makefile.am b/Makefile.am index 6e3798d00a..6273db293d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ install-exec-hook: $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0 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 diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am index b2e5394f10..4c12457566 100644 --- a/addrcheck/Makefile.am +++ b/addrcheck/Makefile.am @@ -8,7 +8,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_addrcheck.so vgpreload_addrcheck.so @@ -21,11 +21,11 @@ vgskin_addrcheck_so_LDADD = \ ../memcheck/mac_replace_strmem.o 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 all-local: 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) diff --git a/addrcheck/tests/Makefile.am b/addrcheck/tests/Makefile.am index 0b4986f95a..60875008fd 100644 --- a/addrcheck/tests/Makefile.am +++ b/addrcheck/tests/Makefile.am @@ -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)) diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am index 0d63a57596..a00235e24a 100644 --- a/cachegrind/Makefile.am +++ b/cachegrind/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place bin_SCRIPTS = cg_annotate @@ -20,4 +20,4 @@ vgskin_cachegrind_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) diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am index c0945ea6e6..1416a96013 100644 --- a/cachegrind/tests/Makefile.am +++ b/cachegrind/tests/Makefile.am @@ -1,11 +1,14 @@ 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 = \ chdir dlclose fpu-28-108 myprint.so diff --git a/configure.in b/configure.in index 00c9d53ed7..f2a58b30d3 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. 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 @@ -357,9 +357,6 @@ AC_OUTPUT( include/Makefile auxprogs/Makefile coregrind/Makefile - coregrind/arch/Makefile - coregrind/arch/x86-linux/Makefile - coregrind/arch/x86-freebsd/Makefile coregrind/demangle/Makefile coregrind/docs/Makefile coregrind/x86/Makefile diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am index 56b2494107..b1682cc16a 100644 --- a/corecheck/Makefile.am +++ b/corecheck/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_corecheck.so @@ -16,4 +16,4 @@ vgskin_corecheck_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) diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index bed2567d0b..157eea9da8 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -1,10 +1,10 @@ -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)"\" AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \ @@ -76,10 +76,10 @@ stage2_SOURCES = \ vg_translate.c \ 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= \ demangle/cp-demangle.o \ @@ -144,6 +144,6 @@ all-local: for i in $(val_PROGRAMS); do \ 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 diff --git a/example/Makefile.am b/example/Makefile.am index a150e71329..3e800d3f4d 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_example.so @@ -16,5 +16,5 @@ vgskin_example_so_LDFLAGS = -shared all-local: 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) diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am index cc7bc156bf..eab751501b 100644 --- a/helgrind/Makefile.am +++ b/helgrind/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_helgrind.so vgpreload_helgrind.so @@ -14,8 +14,8 @@ vgskin_helgrind_so_SOURCES = hg_main.c vgskin_helgrind_so_LDFLAGS = -shared 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 hgincludedir = $(includedir)/valgrind @@ -25,4 +25,4 @@ hginclude_HEADERS = helgrind.h all-local: 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) diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am index c4f478ac32..8b18796a1d 100644 --- a/helgrind/tests/Makefile.am +++ b/helgrind/tests/Makefile.am @@ -1,11 +1,14 @@ 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 \ readshared.stderr.exp readshared.vgtest diff --git a/lackey/Makefile.am b/lackey/Makefile.am index 19061616a6..fdadc30e40 100644 --- a/lackey/Makefile.am +++ b/lackey/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_lackey.so @@ -17,4 +17,4 @@ vgskin_lackey_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) diff --git a/massif/Makefile.am b/massif/Makefile.am index 27ceaae1bd..7e1ce6b187 100644 --- a/massif/Makefile.am +++ b/massif/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_massif.so vgpreload_massif.so @@ -14,11 +14,11 @@ vgskin_massif_so_SOURCES = ms_main.c vgskin_massif_so_LDFLAGS = -shared 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 all-local: 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) diff --git a/massif/hp2ps/Makefile.am b/massif/hp2ps/Makefile.am index f979403faf..58e39a30dd 100644 --- a/massif/hp2ps/Makefile.am +++ b/massif/hp2ps/Makefile.am @@ -1,6 +1,6 @@ valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place AM_CPPFLAGS = $(add_includes) AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \ diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index 9f92680d91..ec5c4731e8 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -9,14 +9,14 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \ AM_CCASFLAGS = $(all_includes) valdir = $(libdir)/valgrind -inplacedir = $(top_srcdir)/.in_place +inplacedir = $(top_builddir)/.in_place val_PROGRAMS = vgskin_memcheck.so vgpreload_memcheck.so 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 vgskin_memcheck_so_SOURCES = \ @@ -46,4 +46,4 @@ mac_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer all-local: 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) diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 1c31834543..fd6349006d 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -7,6 +7,8 @@ noinst_SCRIPTS = filter_allocs filter_leak_check_size \ filter_stderr filter_stderr_backtrace filter_pushfpopf \ filter_tronical +INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2 + EXTRA_DIST = $(noinst_SCRIPTS) \ badaddrvalue.stderr.exp \ badaddrvalue.stdout.exp badaddrvalue.vgtest \ @@ -29,8 +31,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ fwrite.stderr.exp fwrite.stdout.exp fwrite.vgtest \ 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 \ malloc3.stderr.exp malloc3.stdout.exp malloc3.vgtest \ diff --git a/none/Makefile.am b/none/Makefile.am index 95ab243245..30a631ea47 100644 --- a/none/Makefile.am +++ b/none/Makefile.am @@ -6,14 +6,14 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g 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) diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index dfcb4449b3..f14a0241b4 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -1,4 +1,7 @@ -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) \ args.stderr.exp args.stdout.exp args.vgtest \ @@ -16,8 +19,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ dastest.vgtest \ 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 \ fork.stderr.exp fork.stdout.exp fork.vgtest \ @@ -25,15 +27,12 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ fpu_lazy_eflags.vgtest \ 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 \ pth_blockedsig.stdout.exp pth_blockedsig.vgtest \ @@ -52,13 +51,13 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ smc1.stderr.exp smc1.stdout.exp smc1.vgtest \ 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 \ pth_blockedsig pushpopseg \ @@ -137,13 +136,5 @@ gxx304_SOURCES = gxx304.cpp # must be built with these flags -- bug only occurred with them 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 < $< > $@