Ignore:
Timestamp:
2010-01-22T16:52:17Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0cb2d72
Parents:
92bee46 (diff), 9d3133d (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:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/loader/gefi/HelenOS/Makefile

    r92bee46 r48e1467  
    3333FORMAT          = efi-app-$(ARCH)
    3434
    35 all:    gefi hello.efi
     35all:    hello.efi
    3636
    3737clean:
     
    4646#When selected first lines or second lines, select if image is linked into hello or not - usefull for network boot
    4747#hello.so: hello.o image.o division.o
    48 hello.so: hello.o image.bin division.o
     48hello.so: hello.o image.bin division.o gefi
    4949#       $(LD) $(LDFLAGS) -Map hello.map hello.o division.o image.o -o hello.so $(LOADLIBES) #link image inside hello
    5050        $(LD) $(LDFLAGS) -Map hello.map hello.o division.o -o hello.so $(LOADLIBES) #dont link image inside hello
Note: See TracChangeset for help on using the changeset viewer.