Changes in uspace/meson.build [4d58bac:c21d4d6] in mainline

File:

• uspace/meson.build (modified) (6 diffs)

uspace/meson.build

@@ -58 +58 @@
 endforeach
 
-if CONFIG_BAREBONE
-        drv_list = rd_essential_drv
-else
-        drv_list = rd_drv
-endif
-
 foreach drv : drvs
         _basename = run_command(basename, drv, check: true).stdout().strip()
@@ -74 +68 @@
 
         # Install driver metadata.
-        if drv_list.contains('drv' / drv)
+        if not CONFIG_BAREBONE or rd_essential.contains('drv' / drv)
                 _src = meson.current_source_dir() / 'drv' / drv / _basename + '.ma'
                 _dstdir = 'drv' / _basename
@@ -93 +87 @@
         language = 'c'
         installed_data = []
-        platform_specific = false
 
         subdir(appdirs.get('subdir'))
@@ -100 +93 @@
         installdir = appdirs.get('installdir')
 
-        is_drv = (dir.split('/')[0] == 'drv')
-
-        if is_drv
-                # Drivers are installed based on rd_[essential_]drv list
-                install = drv_list.contains(dir)
-        else
-                #
-                # Servers and applications are installed all (unless
-                # platform-specific) or based on rd_essential in case
-                # of barebone build or platform-specific
-                #
-                install = (not CONFIG_BAREBONE and not platform_specific) \
-                    or rd_essential.contains(dir)
-        endif
+        install = not CONFIG_BAREBONE or rd_essential.contains(dir)
 
         if install
@@ -149 +129 @@
         # Binaries in the 'drv' subdirectory link libdrv by default.
 
+        is_drv = (dir.split('/')[0] == 'drv')
 
         if is_drv
@@ -220 +201 @@
                 cpp_args: arch_uspace_c_args + tst.get('c_args'),
                 link_args: arch_uspace_c_args + arch_uspace_link_args + _ldargs,
-                implicit_include_directories: true,
+                implicit_include_directories: false,
                 build_by_default: true,
         )