Fix broken "make dist".

Doesn't fix "make distcheck", however, because this happens:

  /usr/bin/ld: cannot open linker script file ../../coregrind/x86/stage2.lds:
  No such file or directory

For some reason I can't work out, that file is built when you make in a CVS
tree, or manually from a "make dist" tarball, but not when you "make
distcheck".

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2239

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index f865eeed3b799c0a803647a570e10da886bc5f15..f20a1c2c156e91b0a5f03f60224d11c0a3fbd032 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = x86 demangle . docs
+SUBDIRS = x86 demangle arch . docs
 
 add_includes = -I$(srcdir)/demangle -I$(top_srcdir)/include -I$(srcdir)/x86
 

diff --git a/coregrind/x86/Makefile.am b/coregrind/x86/Makefile.am
index 4398182dc068cf94503c243efe5230953ca455fb..779a950c32a032514ca2fa53be08b816b3f3aa1f 100644 (file)
--- a/coregrind/x86/Makefile.am
+++ b/coregrind/x86/Makefile.am
@@ -2,7 +2,6 @@ noinst_HEADERS = \
        ume_archdefs.h
 
 EXTRA_DIST =           \
-       Make.inc        \
        ume_archdefs.c  \
        ume_archdefs.h  \
        ume_entry.S     \