Changeset 3e828ea in mainline for uspace/lib/bithenge

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/lib/bithenge

Files:

• Makefile (deleted)
• meson.build (moved) (moved from uspace/app/bithenge/Makefile ) (1 diff)

uspace/lib/bithenge/meson.build

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
-# TODO: Should be just "bithenge", rest is transitive linker dependencies.
-LIBS = bithenge block
-EXTRA_CFLAGS = -D__HELENOS__
-BINARY = bithenge
-
-SOURCES = \
-        test.c
-
-include $(USPACE_PREFIX)/Makefile.common
+deps = [ 'block' ]
+c_args = [ '-D__HELENOS__' ]
+src = files(
+        'src/helenos/block.c',
+        'src/blob.c',
+        'src/compound.c',
+        'src/expression.c',
+        'src/file.c',
+        'src/print.c',
+        'src/script.c',
+        'src/sequence.c',
+        'src/source.c',
+        'src/transform.c',
+        'src/tree.c',
+)