Changeset ab936440 in mainline for uspace/drv/char/pc-lpt/Makefile


Ignore:
Timestamp:
2019-02-12T20:42:42Z (6 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/drv/char/pc-lpt/Makefile

    r7f7817a9 rab936440  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 
    31 LIBS = math
    32 
    33 BINARY = perf
     29USPACE_PREFIX = ../../..
     30LIBS = drv
     31BINARY = pc-lpt
    3432
    3533SOURCES = \
    36         perf.c \
    37         ipc/ns_ping.c \
    38         ipc/ping_pong.c \
    39         malloc/malloc1.c \
    40         malloc/malloc2.c
     34        main.c \
     35        pc-lpt.c
    4136
    4237include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.