Changeset db71e2a in mainline for uspace/srv/net/slip/Makefile


Ignore:
Timestamp:
2013-07-24T17:42:25Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
69b264a9
Parents:
52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/slip/Makefile

    r52f1882 rdb71e2a  
    11#
    2 # Copyright (c) 2005 Martin Decky
    3 # Copyright (c) 2007 Jakub Jermar
     2# Copyright (c) 2012 Jiri Svoboda
    43# All rights reserved.
    54#
    … …  
    2928
    3029USPACE_PREFIX = ../../..
    31 BINARY = gxe_bd
     30BINARY = slip
    3231
    3332SOURCES = \
    34         gxe_bd.c
     33        slip.c
    3534
    3635include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.