Forward port bochs smp changes; rename smpdetect.c to smp.c.

[seabios.git] / Makefile

diff --git a/Makefile b/Makefile
index c22a6c2cc66689917e9cefdd9692d163148a67ae..71e3cb48b0df271c9dd7795a5201e47264d373e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ OUT=out/
 
 # Source files
 SRCBOTH=output.c util.c floppy.c ata.c misc.c mouse.c kbd.c pci.c \
-        serial.c clock.c pic.c cdrom.c ps2port.c smpdetect.c resume.c \
+        serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \
         pnpbios.c pirtable.c
 SRC16=$(SRCBOTH) system.c disk.c apm.c pcibios.c vgahooks.c font.c
 SRC32=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
@@ -76,7 +76,8 @@ define whole-compile
 $(Q)printf '$(foreach i,$2,#include "../$i"\n)' > $3.tmp.c
 $(Q)$(CC) $1 -fwhole-program -DWHOLE_PROGRAM -c $3.tmp.c -o $3
 endef
-else ifeq "$(COMPSTRAT)" "2"
+else
+ifeq "$(COMPSTRAT)" "2"
 # Second menthod - don't use -fwhole-program at all.
 define whole-compile
 @echo "  Compiling whole program $3"
@@ -90,6 +91,7 @@ define whole-compile
 $(Q)$(CC) $1 -fwhole-program -DWHOLE_PROGRAM -combine -c $2 -o $3
 endef
 endif
+endif
 
 
 $(OUT)%.s: %.c