Changeset dc5c303 in mainline for uspace/lib/c/meson.build

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/lib/c/meson.build (modified) (10 diffs)

uspace/lib/c/meson.build

@@ -1 +1 @@
 #
+# Copyright (c) 2023 Jiri Svoboda
 # Copyright (c) 2005 Martin Decky
 # Copyright (c) 2007 Jakub Jermar
@@ -41 +42 @@
         root_path / 'abi' / 'arch' / UARCH / 'include',
         root_path / 'abi' / 'include',
+        root_path / 'common' / 'include',
 ]
 
@@ -46 +48 @@
 
 allow_shared = true
-
-# FIXME: symlinks from uspace to kernel will break in future Meson version
-#        we should instead move the duplicated library parts into a shared location.
 
 uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
@@ -59 +58 @@
 
 src += files(
+        'common/adt/checksum.c',
+        'common/adt/circ_buf.c',
+        'common/adt/list.c',
+        'common/adt/hash_table.c',
+        'common/adt/odict.c',
+        'common/printf/printf_core.c',
+        'common/stdc/ctype.c',
+        'common/stdc/mem.c',
+        'common/stdc/bsearch.c',
+        'common/stdc/qsort.c',
+        'common/stdc/calloc.c',
+        'common/gsort.c',
+        'common/str.c',
+        'common/str_error.c',
+        'common/strtol.c',
+
         'generic/libc.c',
+        'generic/adt/prodcons.c',
         'generic/as.c',
         'generic/ddi.c',
         'generic/perm.c',
         'generic/capa.c',
-        'generic/clipboard.c',
         'generic/config.c',
         'generic/context.c',
-        'generic/corecfg.c',
-        'generic/ctype.c',
         'generic/device/clock_dev.c',
         'generic/device/hw_res.c',
@@ -80 +93 @@
         'generic/event.c',
         'generic/errno.c',
-        'generic/gsort.c',
         'generic/inttypes.c',
-        'generic/ipc_test.c',
         'generic/loc.c',
-        'generic/mem.c',
-        'generic/str.c',
         'generic/string.c',
-        'generic/str_error.c',
-        'generic/strtol.c',
         'generic/l18n/langs.c',
         'generic/pcb.c',
@@ -96 +103 @@
         'generic/imath.c',
         'generic/io/asprintf.c',
-        'generic/io/input.c',
         'generic/io/io.c',
-        'generic/io/chargrid.c',
-        'generic/io/output.c',
         'generic/io/printf.c',
         'generic/io/log.c',
@@ -108 +112 @@
         'generic/io/vprintf.c',
         'generic/io/vsnprintf.c',
-        'generic/io/printf_core.c',
-        'generic/io/con_srv.c',
-        'generic/io/console.c',
         'generic/io/table.c',
         'generic/irq.c',
@@ -137 +138 @@
         'generic/loader.c',
         'generic/getopt.c',
-        'generic/adt/checksum.c',
-        'generic/adt/circ_buf.c',
-        'generic/adt/list.c',
-        'generic/adt/hash_table.c',
-        'generic/adt/odict.c',
-        'generic/adt/prodcons.c',
         'generic/time.c',
         'generic/tmpfile.c',
@@ -158 +153 @@
         'generic/stats.c',
         'generic/assert.c',
-        'generic/bsearch.c',
-        'generic/qsort.c',
         'generic/ubsan.c',
         'generic/uuid.c',
@@ -186 +179 @@
         'test/inttypes.c',
         'test/io/table.c',
+        'test/loc.c',
         'test/main.c',
         'test/mem.c',