From 43258aa5a29a4624350e1d689d9ae1c58c3472fe Mon Sep 17 00:00:00 2001
From: Erwan Velu <erwanaliasr1@gmail.com>
Date: Wed, 16 Mar 2011 21:39:55 +0100
Subject: [PATCH] sysdump: Fixing includes

This patch remove ugly relative includes like ../something.h
---
 com32/sysdump/Makefile  | 2 ++
 com32/sysdump/acpi.c    | 1 -
 com32/sysdump/cpuid.c   | 1 -
 com32/sysdump/dmi.c     | 1 -
 com32/sysdump/main.c    | 3 +--
 com32/sysdump/memmap.c  | 1 -
 com32/sysdump/memory.c  | 1 -
 com32/sysdump/pci.c     | 1 -
 com32/sysdump/sysdump.h | 2 +-
 com32/sysdump/vesa.c    | 3 +--
 10 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/com32/sysdump/Makefile b/com32/sysdump/Makefile
index b2093de..3de8a5b 100644
--- a/com32/sysdump/Makefile
+++ b/com32/sysdump/Makefile
@@ -22,6 +22,8 @@ include ../MCONFIG
 LIBS	   = ../libutil/libutil_com.a ../lib/libcom32.a ../libupload/libcom32upload.a $(LIBGCC)
 LNXLIBS	   = ../libutil/libutil_lnx.a
 
+CFLAGS += -I$(com32) -I$(topdir)
+
 MODULES	  = sysdump.c32
 TESTFILES =
 
diff --git a/com32/sysdump/acpi.c b/com32/sysdump/acpi.c
index f2be4f4..5022233 100644
--- a/com32/sysdump/acpi.c
+++ b/com32/sysdump/acpi.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "sysdump.h"
-#include "../libupload/upload_backend.h"
 #include "rbtree.h"
 
 struct acpi_rsdp {
diff --git a/com32/sysdump/cpuid.c b/com32/sysdump/cpuid.c
index 53c54f2..e7fc576 100644
--- a/com32/sysdump/cpuid.c
+++ b/com32/sysdump/cpuid.c
@@ -8,7 +8,6 @@
 #include <com32.h>
 #include <sys/cpu.h>
 #include "sysdump.h"
-#include "../libupload/upload_backend.h"
 
 struct cpuid_data {
     uint32_t eax, ebx, ecx, edx;
diff --git a/com32/sysdump/dmi.c b/com32/sysdump/dmi.c
index 64fcffb..ce25efa 100644
--- a/com32/sysdump/dmi.c
+++ b/com32/sysdump/dmi.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "sysdump.h"
-#include "../libupload/upload_backend.h"
 
 struct dmi_header {
     char signature[5];
diff --git a/com32/sysdump/main.c b/com32/sysdump/main.c
index 4931024..f672585 100644
--- a/com32/sysdump/main.c
+++ b/com32/sysdump/main.c
@@ -19,8 +19,7 @@
 #include <dprintf.h>
 #include <console.h>
 #include <sys/cpu.h>
-#include "../../version.h"
-#include "../libupload/upload_backend.h"
+#include <version.h>
 #include "sysdump.h"
 
 const char program[] = "sysdump";
diff --git a/com32/sysdump/memmap.c b/com32/sysdump/memmap.c
index 7a21a31..929873f 100644
--- a/com32/sysdump/memmap.c
+++ b/com32/sysdump/memmap.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <com32.h>
 #include "sysdump.h"
-#include "../libupload/upload_backend.h"
 
 #define E820_CHUNK 128
 struct e820_info {
diff --git a/com32/sysdump/memory.c b/com32/sysdump/memory.c
index 20b20c6..377f9a9 100644
--- a/com32/sysdump/memory.c
+++ b/com32/sysdump/memory.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <sys/cpu.h>
 #include "sysdump.h"
-#include "../libupload/upload_backend.h"
 
 static char *lowmem;
 static size_t lowmem_len;
diff --git a/com32/sysdump/pci.c b/com32/sysdump/pci.c
index 7646a75..9c23a84 100644
--- a/com32/sysdump/pci.c
+++ b/com32/sysdump/pci.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <sys/pci.h>
 #include "sysdump.h"
-#include "../libupload/upload_backend.h"
 
 static void dump_pci_device(struct upload_backend *be, pciaddr_t a, uint8_t hdrtype)
 {
diff --git a/com32/sysdump/sysdump.h b/com32/sysdump/sysdump.h
index 15bb899..72e4875 100644
--- a/com32/sysdump/sysdump.h
+++ b/com32/sysdump/sysdump.h
@@ -1,7 +1,7 @@
 #ifndef SYSDUMP_H
 #define SYSDUMP_H
 
-struct upload_backend;
+#include <libupload/upload_backend.h>
 
 void dump_memory_map(struct upload_backend *);
 void snapshot_lowmem(void);
diff --git a/com32/sysdump/vesa.c b/com32/sysdump/vesa.c
index aebed18..42adc3d 100644
--- a/com32/sysdump/vesa.c
+++ b/com32/sysdump/vesa.c
@@ -1,7 +1,6 @@
 #include <string.h>
 #include <stdio.h>
-#include "../lib/sys/vesa/vesa.h"
-#include "../libupload/upload_backend.h"
+#include <lib/sys/vesa/vesa.h>
 #include "sysdump.h"
 
 void dump_vesa_tables(struct upload_backend *be)
-- 
2.7.4