Changeset 34120f10 in mainline for uspace/lib/c/meson.build

Timestamp:

2023-10-27T19:38:31Z (20 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

63ed840

Parents:

c89ae25 (diff), 694ca3d6 (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 code deduplication work

TL;DR: Added directory /common, which now contains the sole existing
copy of ADT, printf_core, and a few other pieces. Should make changes
to any of those less of a headache.

File:

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

uspace/lib/c/meson.build

@@ -42 +42 @@
         root_path / 'abi' / 'arch' / UARCH / 'include',
         root_path / 'abi' / 'include',
+        root_path / 'common' / 'include',
 ]
 
@@ -60 +61 @@
 
 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/adt/prodcons.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/as.c',
@@ -69 +87 @@
         'generic/context.c',
         'generic/corecfg.c',
-        'generic/ctype.c',
         'generic/device/clock_dev.c',
         'generic/device/hw_res.c',
@@ -81 +98 @@
         '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',
@@ -109 +121 @@
         'generic/io/vprintf.c',
         'generic/io/vsnprintf.c',
-        'generic/io/printf_core.c',
         'generic/io/con_srv.c',
         'generic/io/console.c',
@@ -138 +149 @@
         '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',
@@ -159 +164 @@
         'generic/stats.c',
         'generic/assert.c',
-        'generic/bsearch.c',
-        'generic/qsort.c',
         'generic/ubsan.c',
         'generic/uuid.c',