X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=seabios.git;a=blobdiff_plain;f=Makefile;h=0343ce555b72ce510a5d16a198f967f952d6ff30;hp=08f8af25540e8132e016fd16d1edada13cd70011;hb=refs%2Fheads%2Fcoreboot;hpb=4040195d46ebdcc3503965a0f437a7d7f8b53aee

diff --git a/Makefile b/Makefile
index 08f8af2..0343ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,6 @@ CFLAGS16INC = $(CFLAGSSEG) -DMODE16=1 \
     $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline)
 CFLAGS16 = $(CFLAGS16INC) -g -fomit-frame-pointer
 
-all: $(OUT) $(OUT)bios.bin
-
 # Run with "make V=1" to see the actual compile commands
 ifdef V
 Q=
@@ -57,10 +55,24 @@ Q=@
 MAKEFLAGS += --no-print-directory
 endif
 
+# Common command definitions
+export HOSTCC             := $(CC)
+export CONFIG_SHELL       := sh
+export KCONFIG_AUTOHEADER := autoconf.h
+export KCONFIG_CONFIG     := $(CURDIR)/.config
 OBJCOPY=objcopy
 OBJDUMP=objdump
 STRIP=strip
 
+# Default targets
+-include $(KCONFIG_CONFIG)
+
+target-y = $(OUT) $(OUT)bios.bin
+target-$(CONFIG_BUILD_VGABIOS) += $(OUT)vgabios.bin
+
+all: $(target-y)
+
+# Make definitions
 .PHONY : all clean distclean FORCE
 
 vpath %.c src vgasrc
@@ -169,9 +181,10 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py
 ################ VGA build rules
 
 # VGA src files
-SRCVGA=src/output.c src/util.c vgasrc/vgabios.c vgasrc/vgafb.c vgasrc/vgaio.c \
-    vgasrc/vgatables.c vgasrc/vgafonts.c vgasrc/vbe.c \
-    vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodelx.c
+SRCVGA=src/output.c src/util.c src/pci.c \
+    vgasrc/vgabios.c vgasrc/vgafb.c vgasrc/vgafonts.c vgasrc/vbe.c \
+    vgasrc/stdvga.c vgasrc/stdvgamodes.c vgasrc/stdvgaio.c \
+    vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c
 
 CFLAGS16VGA = $(CFLAGS16INC) -g -Isrc
 
@@ -205,24 +218,16 @@ src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py
 $(OUT)ccode32flat.o: src/acpi-dsdt.hex src/ssdt-proc.hex src/ssdt-pcihp.hex
 
 ####### Kconfig rules
-export HOSTCC             := $(CC)
-export CONFIG_SHELL       := sh
-export KCONFIG_AUTOHEADER := autoconf.h
-export KCONFIG_CONFIG     := $(CURDIR)/.config
-
-$(OUT)autoconf.h : $(KCONFIG_CONFIG)
-	$(Q)$(MAKE) silentoldconfig
-
-$(KCONFIG_CONFIG):
-	$(Q)$(MAKE) defconfig
-
-%onfig:
-	$(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog
-	$(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 $@
+define do-kconfig
+$(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog
+$(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 $1
+endef
 
-help:
-	$(Q)$(MAKE) -f $(CURDIR)/tools/kconfig/Makefile help
+$(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig)
+$(KCONFIG_CONFIG): ; $(call do-kconfig, defconfig)
+%onfig: ; $(call do-kconfig, $@)
+help: ; $(call do-kconfig, $@)
 
 ####### Generic rules
 clean: