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/coregrind/demangle/Makefile.am b/coregrind/demangle/Makefile.am
index b1956c4..9aa1b3a 100644
--- a/coregrind/demangle/Makefile.am
+++ b/coregrind/demangle/Makefile.am
@@ -1,6 +1,6 @@
+include $(top_srcdir)/Makefile.all.am
+include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-AM_CPPFLAGS = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
- -I$(top_builddir)/include -I$(top_srcdir)/include
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
noinst_HEADERS = \
@@ -14,6 +14,7 @@
libdemangle_a_SOURCES = \
cp-demangle.c cplus-dem.c dyn-string.c safe-ctype.c
+## Ignore harmless warnings for these ones
cp-demangle.o: CFLAGS += -Wno-unused -Wno-shadow
cplus-dem.o: CFLAGS += -Wno-unused