From c0c0f99768fa941f92cd6fd471549f4c7ff5d3cf Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Sun, 7 Dec 2014 17:57:55 +0000 Subject: [PATCH] move "include" to "xen/include" All of mini-os is more or less under xen/ now. --- Config.mk | 2 +- Makefile | 6 +++--- app-tools/specs.configure.in | 2 +- app-tools/specs.in | 2 +- {include => xen/include}/mini-os/blkfront.h | 0 {include => xen/include}/mini-os/console.h | 0 {include => xen/include}/mini-os/events.h | 0 {include => xen/include}/mini-os/fbfront.h | 0 {include => xen/include}/mini-os/gntmap.h | 0 {include => xen/include}/mini-os/gnttab.h | 0 {include => xen/include}/mini-os/hypervisor.h | 0 {include => xen/include}/mini-os/ioremap.h | 0 {include => xen/include}/mini-os/kernel.h | 0 {include => xen/include}/mini-os/lib.h | 0 {include => xen/include}/mini-os/mm.h | 0 {include => xen/include}/mini-os/netfront.h | 0 {include => xen/include}/mini-os/os.h | 0 {include => xen/include}/mini-os/pcifront.h | 0 {include => xen/include}/mini-os/queue.h | 0 {include => xen/include}/mini-os/sched.h | 0 {include => xen/include}/mini-os/semaphore.h | 0 {include => xen/include}/mini-os/spinlock.h | 0 {include => xen/include}/mini-os/time.h | 0 {include => xen/include}/mini-os/types.h | 0 {include => xen/include}/mini-os/wait.h | 0 {include => xen/include}/mini-os/waittypes.h | 0 {include => xen/include}/mini-os/x86/limits.h | 0 {include => xen/include}/mini-os/x86/mm.h | 0 {include => xen/include}/mini-os/x86/os.h | 0 {include => xen/include}/mini-os/x86/sched.h | 0 {include => xen/include}/mini-os/x86/spinlock.h | 0 {include => xen/include}/mini-os/x86/traps.h | 0 .../include}/mini-os/x86/x86_32/hypercall-x86_32.h | 0 .../include}/mini-os/x86/x86_64/hypercall-x86_64.h | 0 {include => xen/include}/mini-os/xenbus.h | 0 {include => xen/include}/mini-os/xmalloc.h | 0 36 files changed, 6 insertions(+), 6 deletions(-) rename {include => xen/include}/mini-os/blkfront.h (100%) rename {include => xen/include}/mini-os/console.h (100%) rename {include => xen/include}/mini-os/events.h (100%) rename {include => xen/include}/mini-os/fbfront.h (100%) rename {include => xen/include}/mini-os/gntmap.h (100%) rename {include => xen/include}/mini-os/gnttab.h (100%) rename {include => xen/include}/mini-os/hypervisor.h (100%) rename {include => xen/include}/mini-os/ioremap.h (100%) rename {include => xen/include}/mini-os/kernel.h (100%) rename {include => xen/include}/mini-os/lib.h (100%) rename {include => xen/include}/mini-os/mm.h (100%) rename {include => xen/include}/mini-os/netfront.h (100%) rename {include => xen/include}/mini-os/os.h (100%) rename {include => xen/include}/mini-os/pcifront.h (100%) rename {include => xen/include}/mini-os/queue.h (100%) rename {include => xen/include}/mini-os/sched.h (100%) rename {include => xen/include}/mini-os/semaphore.h (100%) rename {include => xen/include}/mini-os/spinlock.h (100%) rename {include => xen/include}/mini-os/time.h (100%) rename {include => xen/include}/mini-os/types.h (100%) rename {include => xen/include}/mini-os/wait.h (100%) rename {include => xen/include}/mini-os/waittypes.h (100%) rename {include => xen/include}/mini-os/x86/limits.h (100%) rename {include => xen/include}/mini-os/x86/mm.h (100%) rename {include => xen/include}/mini-os/x86/os.h (100%) rename {include => xen/include}/mini-os/x86/sched.h (100%) rename {include => xen/include}/mini-os/x86/spinlock.h (100%) rename {include => xen/include}/mini-os/x86/traps.h (100%) rename {include => xen/include}/mini-os/x86/x86_32/hypercall-x86_32.h (100%) rename {include => xen/include}/mini-os/x86/x86_64/hypercall-x86_64.h (100%) rename {include => xen/include}/mini-os/xenbus.h (100%) rename {include => xen/include}/mini-os/xmalloc.h (100%) diff --git a/Config.mk b/Config.mk index 8ba9b44..21b253e 100644 --- a/Config.mk +++ b/Config.mk @@ -46,4 +46,4 @@ include $(MINI-OS_ROOT)/xen/$(TARGET_ARCH_DIR)/arch.mk extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir)) -DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include +DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/xen/include diff --git a/Makefile b/Makefile index ead2f7d..8005853 100644 --- a/Makefile +++ b/Makefile @@ -112,8 +112,8 @@ endif .PHONY: links links: $(ARCH_LINKS) - [ -e include/xen ] || ln -sf $(XEN_HEADERS) include/xen - [ -e include/mini-os/machine ] || ln -sf $(TARGET_ARCH_FAM) include/mini-os/machine + [ -e xen/include/xen ] || ln -sf $(XEN_HEADERS) xen/include/xen + [ -e xen/include/mini-os/machine ] || ln -sf $(TARGET_ARCH_FAM) xen/include/mini-os/machine .PHONY: arch_lib arch_lib: @@ -190,7 +190,7 @@ clean: arch_clean app-tools_clean rm -f $$dir/*.o; \ done rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core minios.o rumprun.o rump-kernel - rm -f include/xen include/mini-os/machine + rm -f xen/include/xen xen/include/mini-os/machine rm -f tags TAGS $(MAKE) -C httpd -f Makefile.boot clean $(MAKE) -C tests clean diff --git a/app-tools/specs.configure.in b/app-tools/specs.configure.in index cec70af..80aa8be 100644 --- a/app-tools/specs.configure.in +++ b/app-tools/specs.configure.in @@ -1,7 +1,7 @@ %rename cpp_options old_cpp_options *cpp_options: --nostdinc -isystem !BASE!/rump/include -isystem !BASE!/include %(old_cpp_options) !CPPFLAGS! -D__RUMPUSER_XEN__ -D__RUMPAPP__ -D__NetBSD__ +-nostdinc -isystem !BASE!/rump/include -isystem !BASE!/xen/include %(old_cpp_options) !CPPFLAGS! -D__RUMPUSER_XEN__ -D__RUMPAPP__ -D__NetBSD__ *linker: !APPTOOLS!/ld --stunt-intermediate %g.link1 --stunt-final-script !LDSCRIPT! diff --git a/app-tools/specs.in b/app-tools/specs.in index fa304e8..188166f 100644 --- a/app-tools/specs.in +++ b/app-tools/specs.in @@ -1,7 +1,7 @@ %rename cpp_options old_cpp_options *cpp_options: --nostdinc -isystem !BASE!/rump/include -isystem !BASE!/include %(old_cpp_options) !CPPFLAGS! -D__RUMPUSER_XEN__ -D__RUMPAPP__ -D__NetBSD__ +-nostdinc -isystem !BASE!/rump/include -isystem !BASE!/xen/include %(old_cpp_options) !CPPFLAGS! -D__RUMPUSER_XEN__ -D__RUMPAPP__ -D__NetBSD__ *linker: !APPTOOLS!/ld --stunt-intermediate %g.link1 --stunt-final-script !LDSCRIPT! diff --git a/include/mini-os/blkfront.h b/xen/include/mini-os/blkfront.h similarity index 100% rename from include/mini-os/blkfront.h rename to xen/include/mini-os/blkfront.h diff --git a/include/mini-os/console.h b/xen/include/mini-os/console.h similarity index 100% rename from include/mini-os/console.h rename to xen/include/mini-os/console.h diff --git a/include/mini-os/events.h b/xen/include/mini-os/events.h similarity index 100% rename from include/mini-os/events.h rename to xen/include/mini-os/events.h diff --git a/include/mini-os/fbfront.h b/xen/include/mini-os/fbfront.h similarity index 100% rename from include/mini-os/fbfront.h rename to xen/include/mini-os/fbfront.h diff --git a/include/mini-os/gntmap.h b/xen/include/mini-os/gntmap.h similarity index 100% rename from include/mini-os/gntmap.h rename to xen/include/mini-os/gntmap.h diff --git a/include/mini-os/gnttab.h b/xen/include/mini-os/gnttab.h similarity index 100% rename from include/mini-os/gnttab.h rename to xen/include/mini-os/gnttab.h diff --git a/include/mini-os/hypervisor.h b/xen/include/mini-os/hypervisor.h similarity index 100% rename from include/mini-os/hypervisor.h rename to xen/include/mini-os/hypervisor.h diff --git a/include/mini-os/ioremap.h b/xen/include/mini-os/ioremap.h similarity index 100% rename from include/mini-os/ioremap.h rename to xen/include/mini-os/ioremap.h diff --git a/include/mini-os/kernel.h b/xen/include/mini-os/kernel.h similarity index 100% rename from include/mini-os/kernel.h rename to xen/include/mini-os/kernel.h diff --git a/include/mini-os/lib.h b/xen/include/mini-os/lib.h similarity index 100% rename from include/mini-os/lib.h rename to xen/include/mini-os/lib.h diff --git a/include/mini-os/mm.h b/xen/include/mini-os/mm.h similarity index 100% rename from include/mini-os/mm.h rename to xen/include/mini-os/mm.h diff --git a/include/mini-os/netfront.h b/xen/include/mini-os/netfront.h similarity index 100% rename from include/mini-os/netfront.h rename to xen/include/mini-os/netfront.h diff --git a/include/mini-os/os.h b/xen/include/mini-os/os.h similarity index 100% rename from include/mini-os/os.h rename to xen/include/mini-os/os.h diff --git a/include/mini-os/pcifront.h b/xen/include/mini-os/pcifront.h similarity index 100% rename from include/mini-os/pcifront.h rename to xen/include/mini-os/pcifront.h diff --git a/include/mini-os/queue.h b/xen/include/mini-os/queue.h similarity index 100% rename from include/mini-os/queue.h rename to xen/include/mini-os/queue.h diff --git a/include/mini-os/sched.h b/xen/include/mini-os/sched.h similarity index 100% rename from include/mini-os/sched.h rename to xen/include/mini-os/sched.h diff --git a/include/mini-os/semaphore.h b/xen/include/mini-os/semaphore.h similarity index 100% rename from include/mini-os/semaphore.h rename to xen/include/mini-os/semaphore.h diff --git a/include/mini-os/spinlock.h b/xen/include/mini-os/spinlock.h similarity index 100% rename from include/mini-os/spinlock.h rename to xen/include/mini-os/spinlock.h diff --git a/include/mini-os/time.h b/xen/include/mini-os/time.h similarity index 100% rename from include/mini-os/time.h rename to xen/include/mini-os/time.h diff --git a/include/mini-os/types.h b/xen/include/mini-os/types.h similarity index 100% rename from include/mini-os/types.h rename to xen/include/mini-os/types.h diff --git a/include/mini-os/wait.h b/xen/include/mini-os/wait.h similarity index 100% rename from include/mini-os/wait.h rename to xen/include/mini-os/wait.h diff --git a/include/mini-os/waittypes.h b/xen/include/mini-os/waittypes.h similarity index 100% rename from include/mini-os/waittypes.h rename to xen/include/mini-os/waittypes.h diff --git a/include/mini-os/x86/limits.h b/xen/include/mini-os/x86/limits.h similarity index 100% rename from include/mini-os/x86/limits.h rename to xen/include/mini-os/x86/limits.h diff --git a/include/mini-os/x86/mm.h b/xen/include/mini-os/x86/mm.h similarity index 100% rename from include/mini-os/x86/mm.h rename to xen/include/mini-os/x86/mm.h diff --git a/include/mini-os/x86/os.h b/xen/include/mini-os/x86/os.h similarity index 100% rename from include/mini-os/x86/os.h rename to xen/include/mini-os/x86/os.h diff --git a/include/mini-os/x86/sched.h b/xen/include/mini-os/x86/sched.h similarity index 100% rename from include/mini-os/x86/sched.h rename to xen/include/mini-os/x86/sched.h diff --git a/include/mini-os/x86/spinlock.h b/xen/include/mini-os/x86/spinlock.h similarity index 100% rename from include/mini-os/x86/spinlock.h rename to xen/include/mini-os/x86/spinlock.h diff --git a/include/mini-os/x86/traps.h b/xen/include/mini-os/x86/traps.h similarity index 100% rename from include/mini-os/x86/traps.h rename to xen/include/mini-os/x86/traps.h diff --git a/include/mini-os/x86/x86_32/hypercall-x86_32.h b/xen/include/mini-os/x86/x86_32/hypercall-x86_32.h similarity index 100% rename from include/mini-os/x86/x86_32/hypercall-x86_32.h rename to xen/include/mini-os/x86/x86_32/hypercall-x86_32.h diff --git a/include/mini-os/x86/x86_64/hypercall-x86_64.h b/xen/include/mini-os/x86/x86_64/hypercall-x86_64.h similarity index 100% rename from include/mini-os/x86/x86_64/hypercall-x86_64.h rename to xen/include/mini-os/x86/x86_64/hypercall-x86_64.h diff --git a/include/mini-os/xenbus.h b/xen/include/mini-os/xenbus.h similarity index 100% rename from include/mini-os/xenbus.h rename to xen/include/mini-os/xenbus.h diff --git a/include/mini-os/xmalloc.h b/xen/include/mini-os/xmalloc.h similarity index 100% rename from include/mini-os/xmalloc.h rename to xen/include/mini-os/xmalloc.h -- 2.39.5