Changeset c42f50d in mainline for uspace/srv/net/nconfsrv/Makefile


Ignore:
Timestamp:
2013-10-05T11:53:43Z (12 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cbfc8b7
Parents:
408424e (diff), 3e896e1 (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 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/nconfsrv/Makefile

    r408424e rc42f50d  
    11#
    2 # Copyright (c) 2013 Antonin Steinhauser
     2# Copyright (c) 2013 Jiri Svoboda
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = ping6
     29USPACE_PREFIX = ../../..
     30BINARY = nconfsrv
    3131
    3232SOURCES = \
    33         ping6.c
     33        iplink.c \
     34        nconfsrv.c
    3435
    3536include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.