Changeset ab936440 in mainline for uspace/app/lprint/Makefile


Ignore:
Timestamp:
2019-02-12T20:42:42Z (7 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (diff), 4805495 (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.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/app/lprint/Makefile

    r7f7817a9 rab936440  
    11#
    2 # Copyright (c) 2011 Martin Sucha
     2# Copyright (c) 2018 Jiri Svoboda
    33# All rights reserved.
    44#
     
    2828
    2929USPACE_PREFIX = ../..
    30 BINARY = bnchmark
     30BINARY = lprint
    3131
    3232SOURCES = \
    33         bnchmark.c
     33        lprint.c
    3434
    3535include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.