From 6b71b6d8b62bc72fa91f6bc87b39185705f66f6c Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 17 Oct 2011 11:08:57 +0800 Subject: [PATCH] Modules - Added DEPS variable for inter-module includes --- Modules/Makefile.tpl | 2 +- Modules/Storage/FDDv2/Makefile | 1 + {Kernel => Modules/x86/ISADMA}/include/dma.h | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename {Kernel => Modules/x86/ISADMA}/include/dma.h (100%) diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl index 36445f68..b31943e6 100644 --- a/Modules/Makefile.tpl +++ b/Modules/Makefile.tpl @@ -6,7 +6,7 @@ _CPPFLAGS := $(CPPFLAGS) -include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg -LIBINCLUDES := $(addprefix -I$(ACESSDIR)/Modules/Libraries/,$(LIBS)) +LIBINCLUDES := $(addprefix -I$(ACESSDIR)/Modules/,$(DEPS)) LIBINCLUDES := $(addsuffix /include,$(LIBINCLUDES)) CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include diff --git a/Modules/Storage/FDDv2/Makefile b/Modules/Storage/FDDv2/Makefile index f83de396..97aae0c4 100644 --- a/Modules/Storage/FDDv2/Makefile +++ b/Modules/Storage/FDDv2/Makefile @@ -1,6 +1,7 @@ # # +DEPS = x86/ISADMA OBJ = main.o fdc.o NAME = FDDv2 diff --git a/Kernel/include/dma.h b/Modules/x86/ISADMA/include/dma.h similarity index 100% rename from Kernel/include/dma.h rename to Modules/x86/ISADMA/include/dma.h -- 2.20.1