From: norly <ny-git@enpas.org>
Date: Thu, 23 May 2013 23:45:06 +0000 (+0100)
Subject: Use explicit libelf/* path in includes
X-Git-Url: https://git.enpas.org/?p=centaur.git;a=commitdiff_plain;h=2e60e5b7733fbb99009421ca84a5e3cdc49e7fa7

Use explicit libelf/* path in includes
---

diff --git a/Makefile b/Makefile
index 32dbe7c..b62b9ab 100644
--- 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 b1a92ea..c15dd50 100644
--- 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 25575a1..b5e8a3f 100644
--- 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 9d9aefb..70157f7 100644
--- 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 305a3e3..3ce9a90 100644
--- 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 33a68a3..c944234 100644
--- 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 bda2fc1..eb2074f 100644
--- 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 a17216d..47f9820 100644
--- 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 6b57019..7a89d61 100644
--- 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 e79f584..d84e83b 100644
--- 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 3352b14..38a9dd1 100644
--- 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 cb62514..1ac9b84 100644
--- 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 e77efee..9cd44f7 100644
--- 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 e4cf1c1..43abb13 100644
--- 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 06de642..a3bf271 100644
--- 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 6fae9fe..648ee21 100644
--- 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 da57ad7..6e79867 100644
--- 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 edfe153..492f06a 100644
--- 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 fe31448..68d9986 100644
--- 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 3b0ae62..b675e55 100644
--- 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 33f7bdb..0be2536 100644
--- 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 e06f3b7..3cdf270 100644
--- 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 74eeb83..f7ffd54 100644
--- 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>