From: Mark Wielaard <mark@klomp.org>
Date: Tue, 20 Dec 2022 13:53:43 +0000 (+0100)
Subject: Do not use relative include paths in library files.
X-Git-Tag: elfutils-0.189~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ecd16410ce1fe5cb0ac5b7c3342c5cc330e3a04;p=thirdparty%2Felfutils.git

Do not use relative include paths in library files.

Rely on include dirs being set up correctly. Setup libdw AM_CPPFLAGS
to include libebl directory. In libdwfl note that debuginfod.h is a
generated file in the builddir. Only include it in the one file
debuginfod-client.c that really needs it.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index ce0f24f46..a12d14b39 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,9 @@
+2022-12-20  Mark Wielaard  <mark@klomp.org>
+
+	* disasm_begin.c: Include libeblP.h.
+	* disasm_cb.c: Likewise.
+	* bpf_disasm.c: Likewise and include common.h.
+
 2022-10-21  Yonggang Luo  <luoyonggang@gmail.com>
 
 	* asm_abort.c: Don't include unistd.h.
diff --git a/libasm/disasm_begin.c b/libasm/disasm_begin.c
index cb10f66e8..78db90c79 100644
--- a/libasm/disasm_begin.c
+++ b/libasm/disasm_begin.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 
 #include "libasmP.h"
-#include "../libebl/libeblP.h"
+#include "libeblP.h"
 
 
 DisasmCtx_t *
diff --git a/libasm/disasm_cb.c b/libasm/disasm_cb.c
index 80f8b25bf..9353e2e51 100644
--- a/libasm/disasm_cb.c
+++ b/libasm/disasm_cb.c
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "libasmP.h"
-#include "../libebl/libeblP.h"
+#include "libeblP.h"
 
 
 struct symtoken
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 248b1aba6..bd517b945 100644
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,9 @@
+2022-12-20  Mark Wielaard  <mark@klomp.org>
+
+	* bpf_disasm.c: Include common.h and libeblP.h.
+	* i386_disasm.c: Include libeblP.h.
+	* riscv_disasm.c: Likewise.
+
 2022-10-21  Yonggang Luo  <luoyonggang@gmail.com>
 
 	* i386_data.h: Define FCT_mod$64r_m as FCT_mod$r_m for i386.
diff --git a/libcpu/bpf_disasm.c b/libcpu/bpf_disasm.c
index 62643c81b..dabd8a4e4 100644
--- a/libcpu/bpf_disasm.c
+++ b/libcpu/bpf_disasm.c
@@ -37,8 +37,8 @@
 #include <inttypes.h>
 #include "bpf.h"
 
-#include "../libelf/common.h"
-#include "../libebl/libeblP.h"
+#include "common.h"
+#include "libeblP.h"
 
 static const char class_string[8][8] = {
   [BPF_LD]    = "ld",
diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
index 599d16549..c42f8d1cc 100644
--- a/libcpu/i386_disasm.c
+++ b/libcpu/i386_disasm.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../libebl/libeblP.h"
+#include "libeblP.h"
 
 #define MACHINE_ENCODING LITTLE_ENDIAN
 #include "memory-access.h"
diff --git a/libcpu/riscv_disasm.c b/libcpu/riscv_disasm.c
index 7175c0770..823fe9ca0 100644
--- a/libcpu/riscv_disasm.c
+++ b/libcpu/riscv_disasm.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../libebl/libeblP.h"
+#include "libeblP.h"
 
 #define MACHINE_ENCODING LITTLE_ENDIAN
 #include "memory-access.h"
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 019c6580d..4c7af94ed 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,10 @@
+2022-12-20  Mark Wielaard  <mark@klomp.org>
+
+	* Makefile.am (AM_CPPFLAGS): Add -I$(srcdir)/../libebl.
+	* cfi.c: Include libebl.h.
+	* encoded-value.h: Likewise.
+	* frame-cache.h: Likewise.
+
 2022-10-21  Yonggang Luo  <luoyonggang@gmail.com>
 
 	* memory-access.h (get_uleb128_step): Use __typeof.
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 4fda33bd0..1b6fead4b 100644
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -31,7 +31,7 @@ include $(top_srcdir)/config/eu.am
 if BUILD_STATIC
 AM_CFLAGS += $(fpic_CFLAGS)
 endif
-AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdwelf -pthread
+AM_CPPFLAGS += -I$(srcdir)/../libebl -I$(srcdir)/../libelf -I$(srcdir)/../libdwelf -pthread
 VERSION = 1
 
 lib_LIBRARIES = libdw.a
diff --git a/libdw/cfi.c b/libdw/cfi.c
index a73fb03f7..6d08ca90d 100644
--- a/libdw/cfi.c
+++ b/libdw/cfi.c
@@ -31,7 +31,7 @@
 #endif
 
 #include <dwarf.h>
-#include "../libebl/libebl.h"
+#include "libebl.h"
 #include "cfi.h"
 #include "memory-access.h"
 #include "encoded-value.h"
diff --git a/libdw/encoded-value.h b/libdw/encoded-value.h
index f0df4cec3..d4e01924d 100644
--- a/libdw/encoded-value.h
+++ b/libdw/encoded-value.h
@@ -32,7 +32,7 @@
 #include <dwarf.h>
 #include <stdlib.h>
 #include "libdwP.h"
-#include "../libelf/common.h"
+#include "common.h"
 
 
 /* Returns zero if the value is omitted, the encoding is unknown or
diff --git a/libdw/frame-cache.c b/libdw/frame-cache.c
index 5b6afb5d2..683f7f17a 100644
--- a/libdw/frame-cache.c
+++ b/libdw/frame-cache.c
@@ -30,7 +30,7 @@
 # include <config.h>
 #endif
 
-#include "../libebl/libebl.h"
+#include "libebl.h"
 #include "cfi.h"
 #include <search.h>
 #include <stdlib.h>
diff --git a/libdwelf/ChangeLog b/libdwelf/ChangeLog
index 5d61aa85d..1940629f0 100644
--- a/libdwelf/ChangeLog
+++ b/libdwelf/ChangeLog
@@ -1,3 +1,7 @@
+2022-12-20  Mark Wielaard  <mark@klomp.org>
+
+	* libdwelfP.h: Include libdwP.h.
+
 2022-10-21  Yonggang Luo  <luoyonggang@gmail.com>
 
 	* dwelf_elf_begin.c: Don't include unistd.h.
diff --git a/libdwelf/libdwelfP.h b/libdwelf/libdwelfP.h
index d83c759a7..faaf1a202 100644
--- a/libdwelf/libdwelfP.h
+++ b/libdwelf/libdwelfP.h
@@ -30,7 +30,7 @@
 #define _LIBDWELFP_H	1
 
 #include <libdwelf.h>
-#include "../libdw/libdwP.h"	/* We need its INTDECLs.  */
+#include "libdwP.h"	/* We need its INTDECLs.  */
 #include <assert.h>
 #include <string.h>
 
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 685273276..1b465e481 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 3278358d8..6b26cd515 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 cd9b4f388..1ddf0f187 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 4de66248b..b1afb19a9 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 d581daabf..882a5efff 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 e22e984c5..5084c6590 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 961871287..85c4b314d 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 4fbff33ee..221d726da 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 0e5b43561..05a14f7c4 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 c296e3997..aac6657d7 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 498c7cd20..9ba499bbf 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 fc99b163e..73dbf4351 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 cea2ba414..513af6b8d 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 19fa6ded7..41285103d 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 a0ef00146..f7fb3ab75 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 8185d84b2..1e2f02553 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 011b5de9b..cdc528d08 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 128c0c977..a7f3004af 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 7ec7eca1e..06d85eb61 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 ee7afa400..d6f9e9710 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 68b755cd6..32bd7ff8e 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"