Changeset 3e828ea in mainline for uspace/srv/net


Ignore:
Timestamp:
2019-09-23T12:49:29Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (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.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

Location:
uspace/srv/net
Files:
4 added
6 deleted
5 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/dnsrsrv/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = inet
    31 
    32 SOURCES = \
    33         inet.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files(
     30        'dns_msg.c',
     31        'dnsrsrv.c',
     32        'query.c',
     33        'transport.c',
     34)

  • uspace/srv/net/ethip/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 BINARY = loopip
    31 
    32 SOURCES = \
    33         loopip.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'drv' ]
     30src = files(
     31        'arp.c',
     32        'atrans.c',
     33        'ethip.c',
     34        'ethip_nic.c',
     35        'pdu.c',
     36)

  • uspace/srv/net/inetsrv/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 BINARY = dnsrsrv
    31 
    32 SOURCES = \
    33         dns_msg.c \
    34         dnsrsrv.c \
    35         query.c \
    36         transport.c
    37 
    38 include $(USPACE_PREFIX)/Makefile.common
     29src = files(
     30        'addrobj.c',
     31        'icmp.c',
     32        'icmpv6.c',
     33        'inetsrv.c',
     34        'inet_link.c',
     35        'inetcfg.c',
     36        'inetping.c',
     37        'ndp.c',
     38        'ntrans.c',
     39        'pdu.c',
     40        'reass.c',
     41        'sroute.c',
     42)

  • uspace/srv/net/tcp/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = devctl
     29deps = [ 'nettl' ]
    3130
    32 SOURCES = \
    33         devctl.c
     31_common_src = files(
     32        'conn.c',
     33        'inet.c',
     34        'iqueue.c',
     35        'ncsim.c',
     36        'pdu.c',
     37        'rqueue.c',
     38        'segment.c',
     39        'seq_no.c',
     40        'test.c',
     41        'tqueue.c',
     42        'ucall.c',
     43)
    3444
    35 include $(USPACE_PREFIX)/Makefile.common
     45src = files(
     46        'service.c',
     47        'tcp.c',
     48)
     49
     50test_src = files(
     51        'test/conn.c',
     52        'test/iqueue.c',
     53        'test/main.c',
     54        'test/pdu.c',
     55        'test/rqueue.c',
     56        'test/segment.c',
     57        'test/seq_no.c',
     58        'test/tqueue.c',
     59        'test/ucall.c',
     60)
     61
     62src = [ _common_src, src ]
     63test_src = [ _common_src, test_src ]

  • uspace/srv/net/udp/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = nterm
    31 
    32 SOURCES = \
    33         conn.c \
    34         nterm.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'nettl' ]
     30src = files(
     31        'assoc.c',
     32        'msg.c',
     33        'pdu.c',
     34        'service.c',
     35        'udp.c',
     36        'udp_inet.c',
     37)
Note: See TracChangeset for help on using the changeset viewer.