xv6

commit aa6706cc7d7257c59b342ad934ec65a72223b151
parent ff2783442ea2801a4bf6c76f198f36a6e985e7dd
Author: Brian Swetland <swetland@frotz.net>
Date:   Fri, 27 Dec 2013 10:04:20 -0800

move includes to a subdirectory

Diffstat:
M
Makefile
 | 
5
++++-
R
asm.h -> include/asm.h
 | 
0

R
buf.h -> include/buf.h
 | 
0

R
defs.h -> include/defs.h
 | 
0

R
elf.h -> include/elf.h
 | 
0

R
fcntl.h -> include/fcntl.h
 | 
0

R
file.h -> include/file.h
 | 
0

R
fs.h -> include/fs.h
 | 
0

R
kbd.h -> include/kbd.h
 | 
0

R
memlayout.h -> include/memlayout.h
 | 
0

R
mmu.h -> include/mmu.h
 | 
0

R
mp.h -> include/mp.h
 | 
0

R
param.h -> include/param.h
 | 
0

R
proc.h -> include/proc.h
 | 
0

R
spinlock.h -> include/spinlock.h
 | 
0

R
stat.h -> include/stat.h
 | 
0

R
symlink.patch -> include/symlink.patch
 | 
0

R
syscall.h -> include/syscall.h
 | 
0

R
traps.h -> include/traps.h
 | 
0

R
types.h -> include/types.h
 | 
0

R
user.h -> include/user.h
 | 
0

R
x86.h -> include/x86.h
 | 
0

M
mkfs.c
 | 
8
++++----

23 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
@@ -75,7 +75,10 @@ OBJDUMP = $(TOOLPREFIX)objdump
 #CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer
 CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer
 CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
+CFLAGS += -Iinclude
 ASFLAGS = -m32 -gdwarf-2 -Wa,-divide
+ASFLAGS += -Iinclude
+
 # FreeBSD ld wants ``elf_i386_fbsd''
 LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null)
 
@@ -145,7 +148,7 @@ _forktest: forktest.o $(ULIB)
 	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o _forktest forktest.o ulib.o usys.o
 	$(OBJDUMP) -S _forktest > forktest.asm
 
-mkfs: mkfs.c fs.h
+mkfs: mkfs.c include/fs.h
 	gcc -Werror -Wall -o mkfs mkfs.c
 
 # Prevent deletion of intermediate files, e.g. cat.o, after first build, so
diff --git a/asm.h b/include/asm.h
diff --git a/buf.h b/include/buf.h
diff --git a/defs.h b/include/defs.h
diff --git a/elf.h b/include/elf.h
diff --git a/fcntl.h b/include/fcntl.h
diff --git a/file.h b/include/file.h
diff --git a/fs.h b/include/fs.h
diff --git a/kbd.h b/include/kbd.h
diff --git a/memlayout.h b/include/memlayout.h
diff --git a/mmu.h b/include/mmu.h
diff --git a/mp.h b/include/mp.h
diff --git a/param.h b/include/param.h
diff --git a/proc.h b/include/proc.h
diff --git a/spinlock.h b/include/spinlock.h
diff --git a/stat.h b/include/stat.h
diff --git a/symlink.patch b/include/symlink.patch
diff --git a/syscall.h b/include/syscall.h
diff --git a/traps.h b/include/traps.h
diff --git a/types.h b/include/types.h
diff --git a/user.h b/include/user.h
diff --git a/x86.h b/include/x86.h
diff --git a/mkfs.c b/mkfs.c
@@ -6,10 +6,10 @@
 #include <assert.h>
 
 #define stat xv6_stat  // avoid clash with host struct stat
-#include "types.h"
-#include "fs.h"
-#include "stat.h"
-#include "param.h"
+#include "include/types.h"
+#include "include/fs.h"
+#include "include/stat.h"
+#include "include/param.h"
 
 #define static_assert(a, b) do { switch (0) case 0: case (a): ; } while (0)