Merge elf header files

Merge elfcommon.h, elf32.h, elf64.h into
single elf.h -- we do support both elf32
and elf64 anyway. Let put them into common
place.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

4 files changed, 13 insertions, 13 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 6318b223..614d4fbe 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -242,15 +242,15 @@ output/outcoff.$(O): output/outcoff.c compiler.h directives.h eval.h \
 output/outdbg.$(O): output/outdbg.c compiler.h directives.h insnsi.h nasm.h \
  nasmlib.h output/outform.h pptok.h preproc.h regs.h
 output/outelf.$(O): output/outelf.c compiler.h directives.h insnsi.h nasm.h \
- nasmlib.h output/dwarf.h output/elfcommon.h output/outelf.h \
+ nasmlib.h output/dwarf.h output/elf.h output/outelf.h \
  output/outform.h pptok.h preproc.h regs.h
 output/outelf32.$(O): output/outelf32.c compiler.h directives.h eval.h \
- insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf32.h output/elfcommon.h \
+ insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf.h \
  output/outelf.h output/outform.h output/outlib.h pptok.h preproc.h raa.h \
  rbtree.h regs.h saa.h stdscan.h
 output/outelf64.$(O): output/outelf64.c compiler.h directives.h eval.h \
- insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf64.h output/elfcommon.h \
- output/outelf.h output/outform.h output/outlib.h pptok.h preproc.h raa.h \
+ insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf.h \
+ output/outform.h output/outlib.h pptok.h preproc.h raa.h \
  rbtree.h regs.h saa.h stdscan.h
 output/outform.$(O): output/outform.c compiler.h directives.h insnsi.h \
  nasm.h nasmlib.h output/outform.h pptok.h preproc.h regs.h
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index 8811f365..6c743758 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -180,12 +180,12 @@ outcoff.o: outcoff.c compiler.h config.h directives.h eval.h insnsi.h nasm.h \
 outdbg.o: outdbg.c compiler.h config.h directives.h insnsi.h nasm.h \
  nasmlib.h outform.h pptok.h preproc.h regs.h
 outelf.o: outelf.c compiler.h config.h directives.h insnsi.h nasm.h \
- nasmlib.h dwarf.h elfcommon.h outelf.h outform.h pptok.h preproc.h regs.h
+ nasmlib.h dwarf.h elf.h outelf.h outform.h pptok.h preproc.h regs.h
 outelf32.o: outelf32.c compiler.h config.h directives.h eval.h insnsi.h \
- nasm.h nasmlib.h dwarf.h elf32.h elfcommon.h outelf.h outform.h outlib.h \
+ nasm.h nasmlib.h dwarf.h elf.h outelf.h outform.h outlib.h \
  pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h
 outelf64.o: outelf64.c compiler.h config.h directives.h eval.h insnsi.h \
- nasm.h nasmlib.h dwarf.h elf64.h elfcommon.h outelf.h outform.h outlib.h \
+ nasm.h nasmlib.h dwarf.h elf.h outelf.h outform.h outlib.h \
  pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h
 outform.o: outform.c compiler.h config.h directives.h insnsi.h nasm.h \
  nasmlib.h outform.h pptok.h preproc.h regs.h
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 2e63634d..e842e07e 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -271,14 +271,14 @@ output\outcoff.$(O): output\outcoff.c compiler.h directives.h eval.h &
 output\outdbg.$(O): output\outdbg.c compiler.h directives.h insnsi.h nasm.h &
  nasmlib.h output\outform.h pptok.h preproc.h regs.h
 output\outelf.$(O): output\outelf.c compiler.h directives.h insnsi.h nasm.h &
- nasmlib.h output\dwarf.h output\elfcommon.h output\outelf.h &
+ nasmlib.h output\dwarf.h output\elf.h output\outelf.h &
  output\outform.h pptok.h preproc.h regs.h
 output\outelf32.$(O): output\outelf32.c compiler.h directives.h eval.h &
- insnsi.h nasm.h nasmlib.h output\dwarf.h output\elf32.h output\elfcommon.h &
+ insnsi.h nasm.h nasmlib.h output\dwarf.h output\elf.h &
  output\outelf.h output\outform.h output\outlib.h pptok.h preproc.h raa.h &
  rbtree.h regs.h saa.h stdscan.h
 output\outelf64.$(O): output\outelf64.c compiler.h directives.h eval.h &
- insnsi.h nasm.h nasmlib.h output\dwarf.h output\elf64.h output\elfcommon.h &
+ insnsi.h nasm.h nasmlib.h output\dwarf.h output\elf.h &
  output\outelf.h output\outform.h output\outlib.h pptok.h preproc.h raa.h &
  rbtree.h regs.h saa.h stdscan.h
 output\outform.$(O): output\outform.c compiler.h directives.h insnsi.h &
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index 8b3a8240..f6bc0e16 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -281,14 +281,14 @@ output/outcoff.$(O): output/outcoff.c compiler.h directives.h eval.h \
 output/outdbg.$(O): output/outdbg.c compiler.h directives.h insnsi.h nasm.h \
  nasmlib.h output/outform.h pptok.h preproc.h regs.h
 output/outelf.$(O): output/outelf.c compiler.h directives.h insnsi.h nasm.h \
- nasmlib.h output/dwarf.h output/elfcommon.h output/outelf.h \
+ nasmlib.h output/dwarf.h output/elf.h output/outelf.h \
  output/outform.h pptok.h preproc.h regs.h
 output/outelf32.$(O): output/outelf32.c compiler.h directives.h eval.h \
- insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf32.h output/elfcommon.h \
+ insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf.h \
  output/outelf.h output/outform.h output/outlib.h pptok.h preproc.h raa.h \
  rbtree.h regs.h saa.h stdscan.h
 output/outelf64.$(O): output/outelf64.c compiler.h directives.h eval.h \
- insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf64.h output/elfcommon.h \
+ insnsi.h nasm.h nasmlib.h output/dwarf.h output/elf.h \
  output/outelf.h output/outform.h output/outlib.h pptok.h preproc.h raa.h \
  rbtree.h regs.h saa.h stdscan.h
 output/outform.$(O): output/outform.c compiler.h directives.h insnsi.h \