Changeset 3e828ea in mainline for uspace/srv/net/tcp/meson.build

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

File:

• uspace/srv/net/tcp/meson.build (moved) (moved from uspace/app/devctl/Makefile ) (1 diff)

uspace/srv/net/tcp/meson.build

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
-BINARY = devctl
+deps = [ 'nettl' ]
 
-SOURCES = \
-        devctl.c
+_common_src = files(
+        'conn.c',
+        'inet.c',
+        'iqueue.c',
+        'ncsim.c',
+        'pdu.c',
+        'rqueue.c',
+        'segment.c',
+        'seq_no.c',
+        'test.c',
+        'tqueue.c',
+        'ucall.c',
+)
 
-include $(USPACE_PREFIX)/Makefile.common
+src = files(
+        'service.c',
+        'tcp.c',
+)
+
+test_src = files(
+        'test/conn.c',
+        'test/iqueue.c',
+        'test/main.c',
+        'test/pdu.c',
+        'test/rqueue.c',
+        'test/segment.c',
+        'test/seq_no.c',
+        'test/tqueue.c',
+        'test/ucall.c',
+)
+
+src = [ _common_src, src ]
+test_src = [ _common_src, test_src ]