From: Roland McGrath <roland@redhat.com>
Date: Tue, 24 Mar 2009 20:12:47 +0000 (-0700)
Subject: Clean up build hacks for libdw C++ code, still kludged but less so.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edb67ca3df7d17ec09b0271fbd6cba15884a2580;p=thirdparty%2Felfutils.git

Clean up build hacks for libdw C++ code, still kludged but less so.
---

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index fc0817645..f9320db6c 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-24  Roland McGrath  <roland@redhat.com>
+
+	* Makefile.am (libdwpp_a_SOURCES): New variable.
+	(lib_LIBRARIES): Add libdwpp.a to it.
+
 2009-02-26  Roland McGrath  <roland@redhat.com>
 
 	* c++/dwarf (dwarf::attr_value): Add _m_tag private member.
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 3f5032dc6..9a2cff63c 100644
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -87,6 +87,13 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_begin_elf.c dwarf_end.c dwarf_getelf.c \
 		  libdw_visit_scopes.c \
 		  dwarf_entry_breakpoints.c
 
+# XXX need to figure out C++ dso crapola
+lib_LIBRARIES += libdwpp.a
+libdwpp_a_SOURCES = c++/values.cc \
+		    c++/known.cc \
+		    c++/line_info.cc \
+		    c++/edit-values.cc
+
 if MAINTAINER_MODE
 BUILT_SOURCES = $(srcdir)/known-dwarf.h
 MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
diff --git a/libdw/c++/edit-values.cc b/libdw/c++/edit-values.cc
index c579c6764..85da4ca8e 100644
--- a/libdw/c++/edit-values.cc
+++ b/libdw/c++/edit-values.cc
@@ -50,6 +50,8 @@
 #include <config.h>
 #include "dwarf_edit"
 
+#include <typeinfo>
+
 using namespace elfutils;
 
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e0f52bff..cfe9e5f0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-24  Roland McGrath  <roland@redhat.com>
+
+	* Makefile.am (libdwplusplus_SOURCES): Variable removed.
+	(dwarfcmp_SOURCES, dwarflint_SOURCES): Don't use it.
+	(libdwpp): New variable.
+	(dwarfcmp_LDADD, dwarflint_LDADD): Use it.
+
 2009-03-05  Petr Machata  <pmachata@redhat.com>
 
 	* dwarflint.c: Add --nohl command line switch.
diff --git a/src/Makefile.am b/src/Makefile.am
index 33cbf098a..934037aa1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,16 +81,10 @@ ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
 
 libar_a_SOURCES = arlib.c arlib2.c
 
-# XXX need to figure out C++ dso crapola
-libdwplusplus_SOURCES = ../libdw/c++/values.cc ../libdw/c++/known.cc \
-		      	../libdw/c++/line_info.cc \
-		      	../libdw/c++/edit-values.cc
-
 dwarfcmp_SOURCES = dwarfcmp.cc
-dwarfcmp_SOURCES += $(libdwplusplus_SOURCES)
 
-dwarflint_SOURCES = dwarflint.c dwarflint-hl.cc dwarflint-expected-at.cc dwarfstrings.c
-dwarflint_SOURCES += $(libdwplusplus_SOURCES) # XXX drop when we have the DSO
+dwarflint_SOURCES = dwarflint.c dwarflint-hl.cc \
+		    dwarflint-expected-at.cc dwarfstrings.c
 
 readelf_SOURCES = readelf.c dwarfstrings.c
 
@@ -121,6 +115,9 @@ endif
 libebl = ../libebl/libebl.a
 libeu = ../lib/libeu.a
 
+# XXX later the C++ stuff will be in libdw.so directly
+libdwpp = ../libdw/libdwpp.a $(libdw)
+
 nm_no_Wformat = yes
 size_no_Wformat = yes
 strings_no_Wformat = yes
@@ -148,8 +145,8 @@ ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
 strings_LDADD = $(libelf) $(libeu) $(libmudflap)
 ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
 unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl
-dwarfcmp_LDADD = $(libdw) $(libmudflap) -ldl
-dwarflint_LDADD  = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl
+dwarfcmp_LDADD = $(libdwpp) $(libmudflap) -ldl
+dwarflint_LDADD  = $(libebl) $(libelf) $(libdwpp) $(libeu) $(libmudflap) -ldl
 
 ldlex.o: ldscript.c
 ldlex_no_Werror = yes