Changeset 97c7682 in mainline for uspace/srv/locsrv/Makefile


Ignore:
Timestamp:
2012-07-14T11:18:40Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
804d9b6
Parents:
0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/locsrv/Makefile

    r0747468 r97c7682  
    2929
    3030USPACE_PREFIX = ../..
    31 BINARY = loc
     31BINARY = locsrv
    3232STATIC_NEEDED = y
    3333
    3434SOURCES = \
    3535        category.c \
    36         loc.c
     36        locsrv.c
    3737
    3838include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.