Changeset 1ea99cc in mainline for uspace/app/bdsh/Makefile


Ignore:
Timestamp:
2009-08-20T20:47:35Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b50b5af2
Parents:
24edc18
Message:

Merge changes from original Subversion dynload branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/Makefile

    r24edc18 r1ea99cc  
    3737
    3838include $(LIBC_PREFIX)/Makefile.toolchain
     39include $(LIBC_PREFIX)/Makefile.app
    3940
    4041CFLAGS += -I../../srv/kbd/include -I$(LIBBLOCK_PREFIX)
    4142
    42 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     43LIBS += $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
    4344DEFS += -DRELEASE=$(RELEASE)
    4445
     
    114115
    115116$(PROGRAM): $(OBJECTS) $(LIBS)
    116         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
     117        $(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
    117118
    118119# Everything else is a phony target
Note: See TracChangeset for help on using the changeset viewer.