From 879c17784f88994c03e90aca85710d7aac6582de Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 25 Aug 2009 19:46:50 +0000 Subject: [PATCH] Correct typos /subdir/subdirs/ in documentation and util/x86emu/Makefile.inc. Signed-off-by: Myles Watson Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4582 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- documentation/Kconfig.tex | 4 ++-- util/x86emu/Makefile.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex index 25f54621b5..32fdd19ec5 100644 --- a/documentation/Kconfig.tex +++ b/documentation/Kconfig.tex @@ -21,8 +21,8 @@ Kconfig files use the source command to include subdirectories. In most cases, s There is only one Makefile, at the top level. All other makefiles are included as Makefile.inc. All the next-level Makefile.inc files are selected in the top level Makefile. Directories that are platform-independent are in BUILD-y; platform-dependent (e.g. Makefile.inc's that depend on architecture) are included in PLATFORM-y. Make is not recursive. There is only one make process. -\subsection{subdir usage} -Further includes of Makefile.inc, if needed, are done via subdir-y commands. As in Linux, the subdir can be conditional or unconditional. Conditional includes are done via subdir-\$(CONFIG\_VARIABLE) usage; unconditional are done via subdir-y. +\subsection{subdirs usage} +Further includes of Makefile.inc, if needed, are done via subdirs-y commands. As in Linux, the subdirs can be conditional or unconditional. Conditional includes are done via subdirs-\$(CONFIG\_VARIABLE) usage; unconditional are done via subdirs-y. We define the common rules for which variation to use below. \subsection{object file specification} diff --git a/util/x86emu/Makefile.inc b/util/x86emu/Makefile.inc index ec90694dca..52a69b17a8 100644 --- a/util/x86emu/Makefile.inc +++ b/util/x86emu/Makefile.inc @@ -18,9 +18,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -subdir-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += x86emu +subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += x86emu obj-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += biosemu.c -subdir-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += pcbios +subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += pcbios obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.o obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.o