Changeset 985e26d2 in mainline for boot/arch/ia64/Makefile.inc

Timestamp:

2010-01-07T19:06:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8190e63

Parents:

743e17b (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/ia64/Makefile.inc (modified) (1 diff)

boot/arch/ia64/Makefile.inc

@@ -29 +29 @@
 build: $(BASE)/image.boot
 
-$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
-        cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot:
+        $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
+        cp arch/$(BARCH)/loader/image.boot $@
 
-depend:
-        -rm arch/$(BARCH)/loader/image.boot
-
-arch/$(BARCH)/loader/image.boot:
-        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
-
-clean: generic_clean
-        make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
-        -rm -f $(BASE)/image.boot
+clean:
+        $(MAKE) -C arch/$(BARCH)/loader clean
+        rm -f $(BASE)/image.boot $(BASE)/hello.efi $(BASE)/image.bin