Changeset f4f866c in mainline for uspace/srv/net/netif/lo/Makefile


Ignore:
Timestamp:
2010-04-23T21:42:26Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6c39a907
Parents:
38aaacc2 (diff), 80badbe (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/netif/lo/Makefile

    r38aaacc2 rf4f866c  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 ifeq ($(CONFIG_NETWORKING),modular)
    42         BINARY = lo
     41ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     42        LIBS += $(USPACE_PREFIX)/srv/net/nil/nildummy/libnildummy.a
    4343endif
    4444
    45 ifeq ($(CONFIG_NETWORKING),module)
    46         LIBRARY = liblo
    47 endif
     45BINARY = lo
    4846
    4947SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.