summaryrefslogtreecommitdiff
path: root/libdwfl
diff options
context:
space:
mode:
Diffstat (limited to 'libdwfl')
-rw-r--r--libdwfl/ChangeLog24
-rw-r--r--libdwfl/Makefile.am2
-rw-r--r--libdwfl/core-file.c2
-rw-r--r--libdwfl/cu.c4
-rw-r--r--libdwfl/debuginfod-client.c2
-rw-r--r--libdwfl/dwfl_dwarf_line.c2
-rw-r--r--libdwfl/dwfl_lineinfo.c2
-rw-r--r--libdwfl/dwfl_module.c2
-rw-r--r--libdwfl/dwfl_module_dwarf_cfi.c2
-rw-r--r--libdwfl/dwfl_module_eh_cfi.c2
-rw-r--r--libdwfl/dwfl_module_getdwarf.c4
-rw-r--r--libdwfl/dwfl_module_getsrc.c2
-rw-r--r--libdwfl/dwfl_module_getsrc_file.c2
-rw-r--r--libdwfl/dwfl_segment_report_module.c2
-rw-r--r--libdwfl/elf-from-memory.c2
-rw-r--r--libdwfl/frame_unwind.c2
-rw-r--r--libdwfl/libdwflP.h8
-rw-r--r--libdwfl/lines.c2
-rw-r--r--libdwfl/link_map.c2
-rw-r--r--libdwfl/linux-core-attach.c2
-rw-r--r--libdwfl/open.c2
21 files changed, 48 insertions, 26 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 68527327..1b465e48 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,27 @@
+2022-12-20 Mark Wielaard <mark@klomp.org>
+
+ * Makefile.am (AM_CPPFLAGS): debuginfod.h is in builddir.
+ * core-file.c: Include libelfP.h.
+ * cu.c: Include libdwP.h and memory-access.h.
+ * debuginfod-client.c: Include debuginfod.h.
+ * dwfl_dwarf_line.c: Include libdwP.h.
+ * dwfl_lineinfo.c: Include libdwP.h.
+ * dwfl_module.c: Include cfi.h.
+ * dwfl_module_dwarf_cfi.c: Include cfi.h.
+ * dwfl_module_eh_cfi.c: Include cfi.h.
+ * dwfl_module_getdwarf.c: Include libdwP.h and libelfP.h.
+ * dwfl_module_getsrc.c: Include libdwP.h.
+ * dwfl_module_getsrc_file.c: Include libdwP.h.
+ * dwfl_segment_report_module.c: Include libelfP.h.
+ * elf-from-memory.c: Include libelfP.h.
+ * frame_unwind.c: Include dwarf.h.
+ * libdwflP.h: Include libdwP.h and libdwelfP.h. Don't include
+ debuginfod.h.
+ * lines.c: Include libdwP.h.
+ * link_map.c: Include memory-access.h.
+ * linux-core-attach.c: Include memory-access.h.
+ * open.c: Include libelfP.h.
+
2022-11-28 Gavin Li <gavin@matician.com>
Mark Wielaard <mark@klomp.org>
diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am
index 3278358d..6b26cd51 100644
--- a/libdwfl/Makefile.am
+++ b/libdwfl/Makefile.am
@@ -31,7 +31,7 @@
##
include $(top_srcdir)/config/eu.am
AM_CPPFLAGS += -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf -I$(srcdir)/../debuginfod
+ -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf -I$(builddir)/../debuginfod
VERSION = 1
noinst_LIBRARIES = libdwfl.a
diff --git a/libdwfl/core-file.c b/libdwfl/core-file.c
index cd9b4f38..1ddf0f18 100644
--- a/libdwfl/core-file.c
+++ b/libdwfl/core-file.c
@@ -28,7 +28,7 @@
not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "../libelf/libelfP.h" /* For NOTE_ALIGN. */
+#include "libelfP.h" /* For NOTE_ALIGN. */
#undef _
#include "libdwflP.h"
#include <gelf.h>
diff --git a/libdwfl/cu.c b/libdwfl/cu.c
index 4de66248..b1afb19a 100644
--- a/libdwfl/cu.c
+++ b/libdwfl/cu.c
@@ -31,8 +31,8 @@
#endif
#include "libdwflP.h"
-#include "../libdw/libdwP.h"
-#include "../libdw/memory-access.h"
+#include "libdwP.h"
+#include "memory-access.h"
#include <search.h>
diff --git a/libdwfl/debuginfod-client.c b/libdwfl/debuginfod-client.c
index d581daab..882a5eff 100644
--- a/libdwfl/debuginfod-client.c
+++ b/libdwfl/debuginfod-client.c
@@ -35,6 +35,8 @@
#ifdef ENABLE_LIBDEBUGINFOD
+#include "debuginfod.h"
+
#include <pthread.h>
#include <dlfcn.h>
diff --git a/libdwfl/dwfl_dwarf_line.c b/libdwfl/dwfl_dwarf_line.c
index e22e984c..5084c659 100644
--- a/libdwfl/dwfl_dwarf_line.c
+++ b/libdwfl/dwfl_dwarf_line.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/libdwP.h"
+#include "libdwP.h"
Dwarf_Line *
dwfl_dwarf_line (Dwfl_Line *line, Dwarf_Addr *bias)
diff --git a/libdwfl/dwfl_lineinfo.c b/libdwfl/dwfl_lineinfo.c
index 96187128..85c4b314 100644
--- a/libdwfl/dwfl_lineinfo.c
+++ b/libdwfl/dwfl_lineinfo.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/libdwP.h"
+#include "libdwP.h"
const char *
dwfl_lineinfo (Dwfl_Line *line, Dwarf_Addr *addr, int *linep, int *colp,
diff --git a/libdwfl/dwfl_module.c b/libdwfl/dwfl_module.c
index 4fbff33e..221d726d 100644
--- a/libdwfl/dwfl_module.c
+++ b/libdwfl/dwfl_module.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/cfi.h"
+#include "cfi.h"
#include <search.h>
static void
diff --git a/libdwfl/dwfl_module_dwarf_cfi.c b/libdwfl/dwfl_module_dwarf_cfi.c
index 0e5b4356..05a14f7c 100644
--- a/libdwfl/dwfl_module_dwarf_cfi.c
+++ b/libdwfl/dwfl_module_dwarf_cfi.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/cfi.h"
+#include "cfi.h"
Dwarf_CFI *
internal_function
diff --git a/libdwfl/dwfl_module_eh_cfi.c b/libdwfl/dwfl_module_eh_cfi.c
index c296e399..aac6657d 100644
--- a/libdwfl/dwfl_module_eh_cfi.c
+++ b/libdwfl/dwfl_module_eh_cfi.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/cfi.h"
+#include "cfi.h"
Dwarf_CFI *
dwfl_module_eh_cfi (Dwfl_Module *mod, Dwarf_Addr *bias)
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 498c7cd2..9ba499bb 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -34,8 +34,8 @@
#include <inttypes.h>
#include <fcntl.h>
#include <string.h>
-#include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
-#include "../libelf/libelfP.h"
+#include "libdwP.h" /* DWARF_E_* values are here. */
+#include "libelfP.h"
#include "system.h"
static inline Dwfl_Error
diff --git a/libdwfl/dwfl_module_getsrc.c b/libdwfl/dwfl_module_getsrc.c
index fc99b163..73dbf435 100644
--- a/libdwfl/dwfl_module_getsrc.c
+++ b/libdwfl/dwfl_module_getsrc.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/libdwP.h"
+#include "libdwP.h"
Dwfl_Line *
dwfl_module_getsrc (Dwfl_Module *mod, Dwarf_Addr addr)
diff --git a/libdwfl/dwfl_module_getsrc_file.c b/libdwfl/dwfl_module_getsrc_file.c
index cea2ba41..513af6b8 100644
--- a/libdwfl/dwfl_module_getsrc_file.c
+++ b/libdwfl/dwfl_module_getsrc_file.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/libdwP.h"
+#include "libdwP.h"
static inline const char *
diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c
index 19fa6ded..41285103 100644
--- a/libdwfl/dwfl_segment_report_module.c
+++ b/libdwfl/dwfl_segment_report_module.c
@@ -28,7 +28,7 @@
not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "../libelf/libelfP.h" /* For NOTE_ALIGN4 and NOTE_ALIGN8. */
+#include "libelfP.h" /* For NOTE_ALIGN4 and NOTE_ALIGN8. */
#undef _
#include "libdwflP.h"
#include "common.h"
diff --git a/libdwfl/elf-from-memory.c b/libdwfl/elf-from-memory.c
index a0ef0014..f7fb3ab7 100644
--- a/libdwfl/elf-from-memory.c
+++ b/libdwfl/elf-from-memory.c
@@ -27,7 +27,7 @@
not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "../libelf/libelfP.h"
+#include "libelfP.h"
#undef _
#include "libdwflP.h"
diff --git a/libdwfl/frame_unwind.c b/libdwfl/frame_unwind.c
index 8185d84b..1e2f0255 100644
--- a/libdwfl/frame_unwind.c
+++ b/libdwfl/frame_unwind.c
@@ -33,7 +33,7 @@
#include "cfi.h"
#include <stdlib.h>
#include "libdwflP.h"
-#include "../libdw/dwarf.h"
+#include "dwarf.h"
#include <system.h>
/* Maximum number of DWARF expression stack slots before returning an error. */
diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h
index 011b5de9..cdc528d0 100644
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
@@ -38,12 +38,8 @@
#include <stdlib.h>
#include <string.h>
-#include "../libdw/libdwP.h" /* We need its INTDECLs. */
-#include "../libdwelf/libdwelfP.h"
-
-#ifdef ENABLE_LIBDEBUGINFOD
-#include "../debuginfod/debuginfod.h"
-#endif
+#include "libdwP.h" /* We need its INTDECLs. */
+#include "libdwelfP.h"
typedef struct Dwfl_Process Dwfl_Process;
diff --git a/libdwfl/lines.c b/libdwfl/lines.c
index 128c0c97..a7f3004a 100644
--- a/libdwfl/lines.c
+++ b/libdwfl/lines.c
@@ -31,7 +31,7 @@
#endif
#include "libdwflP.h"
-#include "../libdw/libdwP.h"
+#include "libdwP.h"
Dwfl_Error
internal_function
diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c
index 7ec7eca1..06d85eb6 100644
--- a/libdwfl/link_map.c
+++ b/libdwfl/link_map.c
@@ -29,7 +29,7 @@
#include <config.h>
#include "libdwflP.h"
-#include "../libdw/memory-access.h"
+#include "memory-access.h"
#include "system.h"
#include <fcntl.h>
diff --git a/libdwfl/linux-core-attach.c b/libdwfl/linux-core-attach.c
index ee7afa40..d6f9e971 100644
--- a/libdwfl/linux-core-attach.c
+++ b/libdwfl/linux-core-attach.c
@@ -34,7 +34,7 @@
#include <fcntl.h>
#include "system.h"
-#include "../libdw/memory-access.h"
+#include "memory-access.h"
struct core_arg
{
diff --git a/libdwfl/open.c b/libdwfl/open.c
index 68b755cd..32bd7ff8 100644
--- a/libdwfl/open.c
+++ b/libdwfl/open.c
@@ -31,7 +31,7 @@
# include <config.h>
#endif
-#include "../libelf/libelfP.h"
+#include "libelfP.h"
#undef _
#include "libdwflP.h"
View Lorry Controller Status