Changeset 371bd7d in mainline for boot/arch/ia64/loader/gefi/HelenOS/Makefile

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/loader/gefi/HelenOS/Makefile (modified) (4 diffs)

boot/arch/ia64/loader/gefi/HelenOS/Makefile

@@ -22 +22 @@
 #
 
-prefix=$(PREFIX)
 include ../Make.defaults
 CDIR=$(TOPDIR)/..
@@ -33 +32 @@
 FORMAT          = efi-app-$(ARCH)
 
-all:    gefi hello.efi
+all:    hello.efi
 
 clean:
@@ -46 +45 @@
 #When selected first lines or second lines, select if image is linked into hello or not - usefull for network boot
 #hello.so: hello.o image.o division.o
-hello.so: hello.o image.bin division.o
+hello.so: hello.o image.bin division.o gefi
 #       $(LD) $(LDFLAGS) -Map hello.map hello.o division.o image.o -o hello.so $(LOADLIBES) #link image inside hello
         $(LD) $(LDFLAGS) -Map hello.map hello.o division.o -o hello.so $(LOADLIBES) #dont link image inside hello
@@ -69 +68 @@
 
 gefi:
-        $(MAKE) -C .. prefix=$(PREFIX)
+        $(MAKE) -C ..