summaryrefslogtreecommitdiff
path: root/output
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-06-25 13:06:49 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-06-25 13:06:49 -0700
commit1acf6ba82293cda3fc18cc3ba3a64328e496ca64 (patch)
tree8135eb6bc7ba9b0b71d4c1f9b0da8356e4c6b8fa /output
parentd219a3e46f0a9fe2b997eee8acd6bbe212bef4da (diff)
downloadnasm-1acf6ba82293cda3fc18cc3ba3a64328e496ca64.tar.gz
Handle the new ELF headers in the dependency generation
The dependency machinery relies on properly rooted includes, so give it to them... the path syntax munging machinery in the dependency script handles it from a Makefile syntax perspective, and then we can hope that C compilers are smart enough to deal with forward-slash paths even when that is not the native syntax. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'output')
-rw-r--r--output/elf32.h2
-rw-r--r--output/elf64.h2
-rw-r--r--output/outelf.c6
-rw-r--r--output/outelf32.c6
-rw-r--r--output/outelf64.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/output/elf32.h b/output/elf32.h
index ff5e863f..e9589b0a 100644
--- a/output/elf32.h
+++ b/output/elf32.h
@@ -1,7 +1,7 @@
#ifndef OUTPUT_ELF32_H
#define OUTPUT_ELF32_H
-#include "elfcommon.h"
+#include "output/elfcommon.h"
/* ELF standard typedefs (yet more proof that <stdint.h> was way overdue) */
typedef uint16_t Elf32_Half;
diff --git a/output/elf64.h b/output/elf64.h
index 626a24ec..8df6e6fe 100644
--- a/output/elf64.h
+++ b/output/elf64.h
@@ -1,7 +1,7 @@
#ifndef OUTPUT_ELF64_H
#define OUTPUT_ELF64_H
-#include "elfcommon.h"
+#include "output/elfcommon.h"
/* ELF standard typedefs (yet more proof that <stdint.h> was way overdue) */
typedef uint16_t Elf64_Half;
diff --git a/output/outelf.c b/output/outelf.c
index 69acf3f4..d13fb98a 100644
--- a/output/outelf.c
+++ b/output/outelf.c
@@ -10,9 +10,9 @@
#include "nasm.h"
-#include "elfcommon.h"
-#include "dwarf.h"
-#include "outelf.h"
+#include "output/elfcommon.h"
+#include "output/dwarf.h"
+#include "output/outelf.h"
const struct elf_known_section elf_known_sections[] = {
{ ".text", SHT_PROGBITS, SHF_ALLOC|SHF_EXECINSTR, 16 },
diff --git a/output/outelf32.c b/output/outelf32.c
index f413c236..6e4b20d0 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -24,9 +24,9 @@
#include "outlib.h"
#include "rbtree.h"
-#include "elf32.h"
-#include "dwarf.h"
-#include "outelf.h"
+#include "output/elf32.h"
+#include "output/dwarf.h"
+#include "output/outelf.h"
#ifdef OF_ELF32
diff --git a/output/outelf64.c b/output/outelf64.c
index 4b2325fa..80fba870 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -23,9 +23,9 @@
#include "outlib.h"
#include "rbtree.h"
-#include "elf64.h"
-#include "dwarf.h"
-#include "outelf.h"
+#include "output/elf64.h"
+#include "output/dwarf.h"
+#include "output/outelf.h"
#ifdef OF_ELF64