Changeset dc5c303 in mainline for uspace/app/taskbar/meson.build

Timestamp:

2023-12-28T13:59:23Z (2 years 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/app/taskbar/meson.build (modified) (3 diffs)

uspace/app/taskbar/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2022 Jiri Svoboda
+# Copyright (c) 2023 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'ui', 'wndmgt' ]
+deps = [ 'tbarcfg', 'ui', 'wndmgt' ]
 src = files(
         'clock.c',
         'main.c',
         'taskbar.c',
+        'tbsmenu.c',
         'wndlist.c',
 )
@@ -38 +39 @@
         'clock.c',
         'taskbar.c',
+        'tbsmenu.c',
         'wndlist.c',
         'test/clock.c',
         'test/main.c',
         'test/taskbar.c',
+        'test/tbsmenu.c',
         'test/wndlist.c',
 )
+
+if install_nonessential_data
+        installed_data += { 'name': 'taskbar.sif', 'dir': '/cfg' }
+endif