X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=payloads%2Fcoreinfo%2FMakefile;h=6b0e7c4435c72e83c1bee02a44e8f2c5280d49ec;hb=ea37a21acf22a3c63c265e127584b65722f145b5;hp=403eb56e16e3e01944259765ee73dc7ea677ed89;hpb=2fbbb29e54ee6a28461ea130e02eeee2984edb22;p=coreboot.git

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index 403eb56e1..6b0e7c443 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -44,15 +44,16 @@ HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk)
 HOSTCXXFLAGS := -I$(srck) -I$(objk)
 
-LIBPAYLOAD_DIR := ../libpayload
-CC = $(LIBPAYLOAD_DIR)/bin/lpgcc
+LIBPAYLOAD_DIR := ../libpayload/install/libpayload
+XCC := CC=$(CC) $(LIBPAYLOAD_DIR)/bin/lpgcc
 AS = $(LIBPAYLOAD_DIR)/bin/lpas
+STRIP ?= strip
 
 INCLUDES = -Ibuild
 CFLAGS := -Wall -Werror -Os $(INCLUDES)
 OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \
 	  nvram_module.o bootlog_module.o ramdump_module.o lar_module.o \
-	  coreinfo.o
+	  multiboot_module.o cbfs_module.o coreinfo.o
 OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS))
 TARGET  = $(obj)/coreinfo.elf
 
@@ -64,13 +65,13 @@ else
 
 include $(src)/.config
 
-all: prepare $(TARGET)
+all: $(TARGET)
 
-$(TARGET): $(src)/.config $(OBJS)
+$(TARGET): $(src)/.config $(OBJS) prepare
 	$(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CC) -o $@ $(OBJS)
+	$(Q)$(XCC) -o $@ $(OBJS)
 	$(Q)printf "  STRIP   $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)strip -s $@
+	$(Q)$(STRIP) -s $@
 
 $(obj)/%.S.o: $(src)/%.S
 	$(Q)printf "  AS      $(subst $(shell pwd)/,,$(@))\n"
@@ -78,7 +79,7 @@ $(obj)/%.S.o: $(src)/%.S
 
 $(obj)/%.o: $(src)/%.c
 	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CC) $(CFLAGS) -c -o $@ $<
+	$(Q)$(XCC) $(CFLAGS) -c -o $@ $<
 
 endif