Changed name of core/ to coregrind/, since 'core' files/dirs have a habit

of being removed with extreme prejudice.

Also added a couple of necessary Makefile.am files.

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

diff --git a/Makefile.am b/Makefile.am
index ba40fd740f0359d1cc8f6b8566585de19dd94601..749e4b44bb33904ab6863237217001937e0c71fc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS =      core . docs tests include \
+SUBDIRS =      coregrind . docs tests include \
                addrcheck \
                memcheck \
                cachegrind \

diff --git a/configure.in b/configure.in
index d06fa8589c5ffb9d78919e0064843617166d60f3..d72b0ca8187dcf6f907a3666db2432db034bd333 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(core/vg_clientmalloc.c)   # give me a source file, any source file...
+AC_INIT(coregrind/vg_clientmalloc.c)   # give me a source file, any source file...
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(valgrind, HEAD)
 
@@ -296,10 +296,10 @@ AC_OUTPUT(
    docs/Makefile 
    tests/Makefile 
    include/Makefile 
-   core/Makefile 
-   core/demangle/Makefile 
-   core/docs/Makefile
-   core/valgrind
+   coregrind/Makefile 
+   coregrind/demangle/Makefile 
+   coregrind/docs/Makefile
+   coregrind/valgrind
    addrcheck/Makefile
    memcheck/Makefile
    memcheck/tests/Makefile

diff --git a/coregrind/demangle/Makefile.am b/coregrind/demangle/Makefile.am
index 5c4c4c368d22b2aa82c8d79f09b6496fae7c1531..a1172514c6d59e9f5031f3cae3caf7f4c564f75b 100644 (file)
--- a/coregrind/demangle/Makefile.am
+++ b/coregrind/demangle/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/coregrind -I$(top_srcdir)/include
 
 CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
 

diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644 (file)
index 0000000..2f9cdf5
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,6 @@
+EXTRA_DIST = \
+       valgrind.h \
+       vg_constants_skin.h \
+       vg_profile.c \
+       vg_skin.h
+

diff --git a/include/vg_skin.h b/include/vg_skin.h
index 0bfba8710261aff5e8399c7162e5c0c8e4f37ef8..32b7ff2be18d4b4e98a3e32d678103635ceca701 100644 (file)
--- a/include/vg_skin.h
+++ b/include/vg_skin.h
@@ -99,7 +99,7 @@ typedef unsigned char          Bool;
    definitions.
    ------------------------------------------------------------------ */
 
-#include "core/vg_kerneliface.h"
+#include "coregrind/vg_kerneliface.h"
 
 
 /*====================================================================*/

diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644 (file)
index 0000000..5752c0e
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,15 @@
+
+noinst_SCRIPTS = \
+       filter_addresses \
+       filter_discards \
+       filter_stderr_basic \
+       filter_test_paths
+       vg_regtest
+
+EXTRA_DIST = \
+       $(noinst_SCRIPTS) \
+       blocked_syscall.c \
+       clientperm.c \
+       clientstackperm.c \
+       discard.c \
+       resolv.c