Changeset 09178b7f in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-25T17:21:51Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3750c06, 973ef9fc
Parents:
3ac66f69 (diff), 092e4f1 (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 from lp:~jakub/helenos/net.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r3ac66f69 r09178b7f  
    9494#
    9595
    96 ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    97         LIBN = \
    98                 srv/net/nil/eth \
    99                 srv/net/nil/nildummy
    100 else
    101         DIRS += \
    102                 srv/net/nil/eth \
    103                 srv/net/nil/nildummy
    104 endif
     96DIRS += \
     97        srv/net/nil/eth \
     98        srv/net/nil/nildummy
    10599
    106100## Platform-specific hardware support
Note: See TracChangeset for help on using the changeset viewer.