Changed lots of files for the new core/ + skin/ directory structure:
- changed lots of Makefile.am files
- changed configure.in
- changed lots of #include lines for changed file names
- changed lots of file headers n footers for changed file names
- changed vg_regtest to handle new directory structure -- recursively
traverses subdirectories for .vgtest test files
- changed lots of paths in memcheck/ regression test expected outputs
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1090 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 96911ed..98a7de9 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,48 +1,23 @@
-
-SUBDIRS = demangle . docs tests
+SUBDIRS = demangle .
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
+bin_SCRIPTS = valgrind
default.supp: $(SUPP_FILES)
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
val_PROGRAMS = \
valgrind.so \
valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
+ libpthread.so
+
+EXTRA_DIST = vg_libpthread.vs
libpthread_so_SOURCES = \
vg_libpthread.c \
@@ -87,44 +62,11 @@
demangle/dyn-string.o \
demangle/safe-ctype.o
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
noinst_HEADERS = \
vg_kerneliface.h \
vg_include.h \
- vg_skin.h \
vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
+ vg_unsafe.h
MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
@@ -148,29 +90,3 @@
## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
## $(libpthread_so_OBJECTS) \
## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
-
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
-