Changeset 357b5f5 in mainline for uspace/srv/net/nil/nildummy/Makefile


Ignore:
Timestamp:
2011-01-23T20:09:13Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fdb9982c
Parents:
cead2aa (diff), 7e36c8d (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/nil/nildummy/Makefile

    rcead2aa r357b5f5  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    42         LIBRARY = libnildummy
    43 else
    44         BINARY = nildummy
    45 endif
     41BINARY = nildummy
    4642
    4743SOURCES = \
    48         nildummy.c \
    49         nildummy_module.c
     44        nildummy.c
    5045
    5146include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.