Author: myles Date: 2009-08-25 21:46:50 +0200 (Tue, 25 Aug 2009) New Revision: 4582
Modified: trunk/coreboot-v2/documentation/Kconfig.tex trunk/coreboot-v2/util/x86emu/Makefile.inc Log: Correct typos /subdir/subdirs/ in documentation and util/x86emu/Makefile.inc.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Myles Watson mylesgw@gmail.com
Modified: trunk/coreboot-v2/documentation/Kconfig.tex =================================================================== --- trunk/coreboot-v2/documentation/Kconfig.tex 2009-08-25 19:38:46 UTC (rev 4581) +++ trunk/coreboot-v2/documentation/Kconfig.tex 2009-08-25 19:46:50 UTC (rev 4582) @@ -21,8 +21,8 @@ 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}
Modified: trunk/coreboot-v2/util/x86emu/Makefile.inc =================================================================== --- trunk/coreboot-v2/util/x86emu/Makefile.inc 2009-08-25 19:38:46 UTC (rev 4581) +++ trunk/coreboot-v2/util/x86emu/Makefile.inc 2009-08-25 19:46:50 UTC (rev 4582) @@ -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