Doing another 'make' after a 'make clean' was broken until now. Fix it

[coreboot.git] / payloads / coreinfo / Makefile

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index f22170946cb2326e2a28f4bdf7f503bfa0eabeb8..e3d4b6ed1b4f3812942e39a800e9ca9d7766e6e6 100644 (file)
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -46,21 +46,20 @@ HOSTCXXFLAGS := -I$(srck) -I$(objk)
 
 CC = gcc
 CROSS_CFLAGS = -m32
-INCLUDES = -I../libpayload/include \
+INCLUDES = -I../libpayload/include -Ibuild \
           -I$(shell $(CC) $(CROSS_CFLAGS) -print-search-dirs | \
           head -n 1 | cut -d' ' -f2)include
 LIBPAYLOAD = ../libpayload/libpayload.a
 LIBGCC := $(shell $(CC) $(CROSS_CFLAGS) -print-libgcc-file-name)
 CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
-MODULES = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o
-OBJECTS = coreinfo.o
-OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS)) $(patsubst %,$(obj)/%,$(MODULES))
+OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \
+         nvram_module.o coreinfo.o
+OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS))
 TARGET  = $(obj)/coreinfo.elf
 
 ifeq ($(strip $(HAVE_DOTCONFIG)),)
 
-all:
-       $(Q)printf "Please run make config/menuconfig/xconfig/gconfig first.\n"
+all: config
 
 else
 
@@ -91,9 +90,10 @@ prepare:
        $(Q)mkdir -p $(obj)/util/kconfig/lxdialog
 
 clean:
-       $(Q)rm -rf build
+       $(Q)rm -rf build/util build/*.conf build/*.cmd build/*.elf build/*.o
 
 distclean: clean
+       $(Q)rm -rf build
        $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
 
 include util/kconfig/Makefile