Use Makefile.am includes. This gets rid of 110 lines of repetitive Makefile.am
cruft, yay!
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2641 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index e46a5be..a19a906 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -1,15 +1,7 @@
+include $(top_srcdir)/Makefile.tool.am
-SUBDIRS = . tests docs
-
-all_includes = -I$(top_builddir)/include -I$(top_srcdir)/include
-
-AM_CPPFLAGS = $(all_includes)
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \
- @PREFERRED_STACK_BOUNDARY@ -g
-AM_CCASFLAGS = $(all_includes)
-
-valdir = $(libdir)/valgrind
-inplacedir = $(top_builddir)/.in_place
+## Build Memcheck at a higher optimisation level
+AM_CFLAGS += -O2
val_PROGRAMS = vgskin_memcheck.so vgpreload_memcheck.so
@@ -43,7 +35,3 @@
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_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)