Modularised the demangler into m_demangle. (It very nearly fit our new
module structure as-is.)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3654 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 0d01f4b..f7dd59b 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
MODULES = \
- demangle \
+ m_demangle \
m_aspacemgr \
m_replacemalloc \
m_sigframe \
@@ -19,7 +19,7 @@
$(VG_ARCH_ALL) $(VG_OS_ALL) $(VG_PLATFORM_ALL) \
$(MODULES) .
-AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" -I$(srcdir)/demangle \
+AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" \
-DKICKSTART_BASE=@KICKSTART_BASE@
AM_CFLAGS = $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O -g @ARCH_CORE_AM_CFLAGS@
@@ -39,6 +39,7 @@
core_asm.h \
pub_core_aspacemgr.h \
pub_core_debuglog.h \
+ pub_core_demangle.h \
pub_core_errormgr.h \
pub_core_execontext.h \
pub_core_mallocfree.h \
@@ -75,7 +76,6 @@
ume.c \
\
vg_scheduler.c \
- vg_demangle.c \
vg_hashtable.c \
vg_main.c \
vg_messages.c \
@@ -95,7 +95,7 @@
## libplatform.a must be before libarch.a and libos.a, it seems.
stage2_extra= \
- demangle/libdemangle.a \
+ m_demangle/libdemangle.a \
m_aspacemgr/libaspacemgr.a \
m_sigframe/libsigframe.a \
m_syscalls/libsyscalls.a \