libpayload: fix wborder()

[coreboot.git] / payloads / bayou / Makefile

diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile
index 648d68a28ca986c4bb3efaa5493013ee553072cb..4ad9d0de03c568ffce684dd2a778c6a82961c8a2 100644 (file)
--- a/payloads/bayou/Makefile
+++ b/payloads/bayou/Makefile
@@ -24,9 +24,14 @@ CONFIG_BUILTIN_LAR=y
 PBUILDER_CONFIG=bayou.xml
 BUILTIN_LAR=builtin.lar
 
-LIBPAYLOAD_DIR := ../libpayload
+export src := $(shell pwd)
+export obj := $(src)/build
 
-CC=gcc
+LIBPAYLOAD_DIR := $(obj)/libpayload
+
+CC?=gcc
+STRIP?=strip
+OBJCOPY?=objcopy
 
 FFLAGS-y=
 FFLAGS-$(CONFIG_BUILTIN_LAR) += -DCONFIG_BUILTIN_LAR
@@ -45,21 +50,23 @@ LIBGCC=$(shell $(CC) -m32 -print-libgcc-file-name)
 LPCC=$(LIBPAYLOAD_DIR)/bin/lpgcc
 
 bayou.elf: $(OBJECTS-y)
-       $(LPCC) -ldscript bayou.ldscript -m32 -o $@ $(OBJECTS-y)
-       @ strip $@
+       $(LPCC) $(LDFLAGS) -m32 -o $@ $(OBJECTS-y)
+       @$(STRIP) $@
 
 builtin-lar.o: $(BUILTIN_LAR)
-       @ objcopy -I binary -B i386 -O elf32-i386 $(BUILTIN_LAR) $@
+       @$(OBJCOPY) -I binary -B i386 -O elf32-i386 $(BUILTIN_LAR) $@
 
 builtin.lar: util/pbuilder/pbuilder
-       @ rm -f $@
+       @rm -f $@
        util/pbuilder/pbuilder -c $(PBUILDER_CONFIG) create $@
 
 util/pbuilder/pbuilder:
-       make -C util/pbuilder
+       $(MAKE) -C util/pbuilder
 
 %.o: %.c
-       $(LPCC) $(CFLAGS) -c -o $@ $<   
+       $(LPCC) $(CFLAGS) -c -o $@ $<
 
 clean:
        rm -f *.o bayou.elf builtin.lar
+       $(MAKE) -C util/pbuilder clean
+