Use explicit libelf/* path in includes

diff --git a/Makefile b/Makefile
index 32dbe7c1d595e05e109c4d381028898a5d8aa784..b62b9ab7582ca6af70f0a73df2d214b412ad8cce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ HEADERS += $(shell find $(SRCDIR)/ -iname "*.h")
 SOURCES := $(shell find $(SRCDIR)/ -iname "*.c")
 OBJS    := $(patsubst %.c, $(BUILDDIR)/%.o, $(SOURCES))
 
-INCLUDES := $(patsubst %, -I%, $(INCLUDEDIR) $(SRCDIR)) -I /usr/include/libelf
+INCLUDES := $(patsubst %, -I%, $(INCLUDEDIR) $(SRCDIR))
 CFLAGS   := -g -Wall
 LDFLAGS  := -lelf
 

diff --git a/include/elfhandle.h b/include/elfhandle.h
index b1a92eac04115f2390bd864455b3407c739cab49..c15dd501ab528cd9c094f7e8186722dba061b95e 100644 (file)
--- a/include/elfhandle.h
+++ b/include/elfhandle.h
@@ -1,7 +1,7 @@
 #ifndef __ELFHANDLE_H__
 #define __ELFHANDLE_H__
 
-#include <libelf.h>
+#include <libelf/libelf.h>
 
 typedef struct {
   int fd;

diff --git a/include/libelfu/elfops.h b/include/libelfu/elfops.h
index 25575a102434c0647085169b34a6237cbcecaaf3..b5e8a3f1830dfbd8596c447ab288773d6087547c 100644 (file)
--- a/include/libelfu/elfops.h
+++ b/include/libelfu/elfops.h
@@ -1,8 +1,8 @@
 #ifndef __LIBELFU_ELFOPS_H_
 #define __LIBELFU_ELFOPS_H_
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/types.h>
 

diff --git a/include/libelfu/generic.h b/include/libelfu/generic.h
index 9d9aefb0249e8636d04d340fd69478cb114bf0f0..70157f7b7296ed3257d265e93fe700976f905bdf 100644 (file)
--- a/include/libelfu/generic.h
+++ b/include/libelfu/generic.h
@@ -1,7 +1,7 @@
 #ifndef __LIBELFU_GENERIC_H__
 #define __LIBELFU_GENERIC_H__
 
-#include <gelf.h>
+#include <libelf/gelf.h>
 
 
 size_t elfu_gScnSizeFile(const GElf_Shdr *shdr);

diff --git a/include/libelfu/modelops.h b/include/libelfu/modelops.h
index 305a3e32191777c030172a8356836bf40fcfeeaf..3ce9a9059c35923bb5b7902e37ddc80af32ad21f 100644 (file)
--- a/include/libelfu/modelops.h
+++ b/include/libelfu/modelops.h
@@ -2,7 +2,7 @@
 #define __LIBELFU_MODELOPS_H__
 
 #include <elf.h>
-#include <gelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/modeltypes.h>
 

diff --git a/include/libelfu/modeltypes.h b/include/libelfu/modeltypes.h
index 33a68a3d66ea27420579b4efbbd44e3bac1a2df8..c944234cde33a73b1a1db7880c97d4143079402d 100644 (file)
--- a/include/libelfu/modeltypes.h
+++ b/include/libelfu/modeltypes.h
@@ -4,7 +4,7 @@
 #include <sys/queue.h>
 
 #include <elf.h>
-#include <gelf.h>
+#include <libelf/gelf.h>
 
 
 typedef struct ElfuScn {

diff --git a/include/printing.h b/include/printing.h
index bda2fc18833e62165b4e38b8b7f010458f9c2386..eb2074f0b2f887fc9cd294acca0a814357d3c905 100644 (file)
--- a/include/printing.h
+++ b/include/printing.h
@@ -1,7 +1,7 @@
 #ifndef __PRINTING_H__
 #define __PRINTING_H__
 
-#include <libelf.h>
+#include <libelf/libelf.h>
 
 
 void printHeader(Elf *e);

diff --git a/src/elfhandle.c b/src/elfhandle.c
index a17216d5ea74aeaa36c3ae2cd285c3ef23b7407c..47f9820f5b081d7150947510f751e0df4020ed6c 100644 (file)
--- a/src/elfhandle.c
+++ b/src/elfhandle.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libelf.h>
+#include <libelf/libelf.h>
 
 #include "elfhandle.h"
 

diff --git a/src/elfops/phdr-contains-section.c b/src/elfops/phdr-contains-section.c
index 6b57019de654770a68c8a3640b7b5d105e44e625..7a89d61d068f5a60be569b34247500bd86240be7 100644 (file)
--- a/src/elfops/phdr-contains-section.c
+++ b/src/elfops/phdr-contains-section.c
@@ -1,5 +1,5 @@
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 

diff --git a/src/elfops/phdr-fixup-selfref.c b/src/elfops/phdr-fixup-selfref.c
index e79f5842d71207f44019b24e7d34783c187ef0ee..d84e83b8f2d38716ef12a58308d1d77c6eade553 100644 (file)
--- a/src/elfops/phdr-fixup-selfref.c
+++ b/src/elfops/phdr-fixup-selfref.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 void elfu_ePhdrFixupSelfRef(Elf *e)
 {

diff --git a/src/elfops/section-by-name.c b/src/elfops/section-by-name.c
index 3352b14d69cc46679ca82c7876a7fd4cdc381201..38a9dd1a96f91b977dea04028e513ea4d00b584e 100644 (file)
--- a/src/elfops/section-by-name.c
+++ b/src/elfops/section-by-name.c
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 

diff --git a/src/elfops/section-in-segment.c b/src/elfops/section-in-segment.c
index cb625141d8eaa5c2d3448f4dfb2fb47f67be38f4..1ac9b845732627820e9a72795f428d465b249266 100644 (file)
--- a/src/elfops/section-in-segment.c
+++ b/src/elfops/section-in-segment.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 

diff --git a/src/elfops/section-name.c b/src/elfops/section-name.c
index e77efeee174fa6bd70e67cc3a93f5f99204a9bef..9cd44f70c9ac1615747c3aace5688619a48b16c9 100644 (file)
--- a/src/elfops/section-name.c
+++ b/src/elfops/section-name.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 

diff --git a/src/generic/scnSize.c b/src/generic/scnSize.c
index e4cf1c1310a263e5271767c938e998ac11d86e87..43abb132acdda66ccc9dba96439a9f4a3391505f 100644 (file)
--- a/src/generic/scnSize.c
+++ b/src/generic/scnSize.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <sys/types.h>
-#include <gelf.h>
+#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 

diff --git a/src/main.c b/src/main.c
index 06de642171fb2df3516719c7cc119e32a56068e5..a3bf2711adb08132b912ffa72a7525778ad31dce 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 
 #include <getopt.h>
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 

diff --git a/src/model/expandNobits.c b/src/model/expandNobits.c
index 6fae9fe0956cbfde90c17a1fe1eb5fe1e85d247a..648ee210bcdb9706ce8d54b6dd3969bf03a14c91 100644 (file)
--- a/src/model/expandNobits.c
+++ b/src/model/expandNobits.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <gelf.h>
+#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 

diff --git a/src/model/fromFile.c b/src/model/fromFile.c
index da57ad7cf15170e76a7f0b4a950f45e23bfa294f..6e79867feff007b3d14e1231f010562ad73c0ed7 100644 (file)
--- a/src/model/fromFile.c
+++ b/src/model/fromFile.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 

diff --git a/src/model/insert.c b/src/model/insert.c
index edfe153ecd8bd71316bf4834d2772c3b1bd59f5c..492f06a8adf66b06cdfd2969243d6337a8550ebc 100644 (file)
--- a/src/model/insert.c
+++ b/src/model/insert.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <sys/types.h>
-#include <gelf.h>
+#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 

diff --git a/src/model/section-name.c b/src/model/section-name.c
index fe3144801a1614c62cbd71a169ca489c0ab2ae4b..68d9986eb2eec84a777161df9ad928c02a617db0 100644 (file)
--- a/src/model/section-name.c
+++ b/src/model/section-name.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 

diff --git a/src/model/toFile.c b/src/model/toFile.c
index 3b0ae62500d1535b47b04ec160c5663fef887cc5..b675e55d2b64fc1493468fb33681077cb9ac65f3 100644 (file)
--- a/src/model/toFile.c
+++ b/src/model/toFile.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 

diff --git a/src/printing/header.c b/src/printing/header.c
index 33f7bdbc0c49bd4afc511c0c21975ccbeb12dbbb..0be253697d9e6011dc59cf65f4dae907f8f0e759 100644 (file)
--- a/src/printing/header.c
+++ b/src/printing/header.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 
 void printHeader(Elf *e)

diff --git a/src/printing/sections.c b/src/printing/sections.c
index e06f3b7904097450f0ca573cadaaf7f94b6d7d37..3cdf270a757e857546fa67cb717102fa63c613b5 100644 (file)
--- a/src/printing/sections.c
+++ b/src/printing/sections.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 #include "printing.h"

diff --git a/src/printing/segments.c b/src/printing/segments.c
index 74eeb831ccc81e80da742e136fb75ddcefe9132c..f7ffd54a642f16908b70ea492bfe4c9fd2b62448 100644 (file)
--- a/src/printing/segments.c
+++ b/src/printing/segments.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>