Changeset 03362fbd in mainline for uspace/app/date/Makefile


Ignore:
Timestamp:
2013-02-09T23:14:45Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
22dfd38
Parents:
b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/app/date/Makefile

    rb5d2e57 r03362fbd  
    11#
    2 # Copyright (c) 2011 Martin Decky
     2# Copyright (c) 2012 Maurizio Lombardi
    33# All rights reserved.
    44#
    … …  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBRARY = libfb
     30BINARY = date
    3131
    3232SOURCES = \
    33         fb.c \
    34         imgmap.c \
    35         screenbuffer.c
     33        date.c
    3634
    3735include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.