X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=3d60b88133dc791e65bd75b84ec7be6530e8d433;hb=acdcbf024deffab9411480b1bd34cc92007fb8e8;hp=ef8e15d11a3ece249b570864eaf2b7c4467ffb21;hpb=c973788346e984a3d91f443008fdd613c30e3185;p=seabios.git

diff --git a/Makefile b/Makefile
index ef8e15d..3d60b88 100644
--- a/Makefile
+++ b/Makefile
@@ -12,41 +12,40 @@ OUT=out/
 
 # Source files
 SRCBOTH=misc.c stacks.c pmm.c output.c util.c block.c floppy.c ata.c mouse.c \
-        kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \
-        pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \
-        usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \
-        virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c
+    kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \
+    pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \
+    usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \
+    virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c
 SRC16=$(SRCBOTH) system.c disk.c font.c
 SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
-      acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
-      lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \
-      biostables.c xen.c bmp.c
+    acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
+    lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \
+    biostables.c xen.c bmp.c
 SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c
 
-cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
-              /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;)
+cc-option=$(shell if test -z "`$(1) $(2) -S -o /dev/null -xc /dev/null 2>&1`" \
+    ; then echo "$(2)"; else echo "$(3)"; fi ;)
 
 # Default compiler flags
 COMMONCFLAGS = -I$(OUT) -Os -MD \
-               -Wall -Wno-strict-aliasing -Wold-style-definition \
-               $(call cc-option,$(CC),-Wtype-limits,) \
-               -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \
-               -mrtd -minline-all-stringops \
-               -freg-struct-return -ffreestanding -fomit-frame-pointer \
-               -fno-delete-null-pointer-checks \
-               -ffunction-sections -fdata-sections -fno-common
+    -Wall -Wno-strict-aliasing -Wold-style-definition \
+    $(call cc-option,$(CC),-Wtype-limits,) \
+    -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \
+    -mrtd -minline-all-stringops \
+    -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \
+    -ffunction-sections -fdata-sections -fno-common
 COMMONCFLAGS += $(call cc-option,$(CC),-nopie,)
 COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
 COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
 
-CFLAGS32FLAT = $(COMMONCFLAGS) -g -DMODE16=0 -DMODESEGMENT=0
+CFLAGS32FLAT = $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -g -fomit-frame-pointer
 CFLAGSSEG = $(COMMONCFLAGS) -DMODESEGMENT=1 -fno-defer-pop \
-            $(call cc-option,$(CC),-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \
-            $(call cc-option,$(CC),-fno-tree-switch-conversion,)
-CFLAGS32SEG = $(CFLAGSSEG) -DMODE16=0 -g
+    $(call cc-option,$(CC),-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \
+    $(call cc-option,$(CC),-fno-tree-switch-conversion,)
+CFLAGS32SEG = $(CFLAGSSEG) -DMODE16=0 -g -fomit-frame-pointer
 CFLAGS16INC = $(CFLAGSSEG) -DMODE16=1 \
-              $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline)
-CFLAGS16 = $(CFLAGS16INC) -g
+    $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline)
+CFLAGS16 = $(CFLAGS16INC) -g -fomit-frame-pointer
 
 all: $(OUT) $(OUT)bios.bin
 
@@ -171,9 +170,12 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py
 
 # VGA src files
 SRCVGA=src/output.c src/util.c vgasrc/vga.c vgasrc/vgafb.c vgasrc/vgaio.c \
-       vgasrc/vgatables.c vgasrc/vgafonts.c vgasrc/clext.c
+    vgasrc/vgatables.c vgasrc/vgafonts.c \
+    vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodelx.c
 
-$(OUT)vgaccode.16.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16) -S -Isrc, $(SRCVGA),$@)
+CFLAGS16VGA = $(CFLAGS16INC) -g -Isrc
+
+$(OUT)vgaccode.16.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA) -S, $(SRCVGA),$@)
 
 $(OUT)vgalayout16.o: vgaentry.S $(OUT)vgaccode.16.s $(OUT)asm-offsets.h
 	@echo "  Compiling (16bit) $@"
@@ -219,6 +221,9 @@ $(KCONFIG_CONFIG):
 	$(Q)mkdir -p $(OUT)/include/config
 	$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/tools/kconfig/Makefile srctree=$(CURDIR) src=tools/kconfig obj=tools/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $@
 
+help:
+	$(Q)$(MAKE) -f $(CURDIR)/tools/kconfig/Makefile help
+
 ####### Generic rules
 clean:
 	$(Q)rm -rf $(OUT)