From 27578ec8c1f5dbde801f82b9b35a741c61fefa01 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 25 Feb 2011 17:46:56 +0000 Subject: [PATCH] [linux] Remove Linux-specific code from default (non-Linux) build Building the Linux-specific code (tap.o et al) requires external headers that have proven to be extremely variable across systems, causing frequent build failures. Until this situation is rectified, remove the Linux-specific code from the default (non-Linux build). Signed-off-by: Michael Brown --- src/Makefile | 3 +-- src/arch/x86/Makefile.linux | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index d51591ee6..1a878ef8f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -74,8 +74,7 @@ SRCDIRS += drivers/block SRCDIRS += drivers/nvs SRCDIRS += drivers/bitbash SRCDIRS += drivers/infiniband -SRCDIRS += drivers/linux -SRCDIRS += interface/pxe interface/efi interface/smbios interface/linux +SRCDIRS += interface/pxe interface/efi interface/smbios SRCDIRS += tests SRCDIRS += crypto crypto/axtls crypto/matrixssl SRCDIRS += hci hci/commands hci/tui diff --git a/src/arch/x86/Makefile.linux b/src/arch/x86/Makefile.linux index c3471dd75..fd56b4b69 100644 --- a/src/arch/x86/Makefile.linux +++ b/src/arch/x86/Makefile.linux @@ -1,6 +1,8 @@ MEDIA = linux INCDIRS += arch/x86/include/linux +SRCDIRS += interface/linux +SRCDIRS += drivers/linux SRCDIRS += arch/x86/core/linux $(BIN)/%.linux : $(BIN)/%.linux.tmp