]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
build-sys: fix invalid args detected by meson 0.42 (#6561)
authoruserwithuid <userwithuid@gmail.com>
Wed, 9 Aug 2017 13:41:44 +0000 (13:41 +0000)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 9 Aug 2017 13:41:44 +0000 (09:41 -0400)
some run_target() calls were using params from custom_target()

example message:
WARNING: Passed invalid keyword argument "input". This will become a hard error in the future.

New way to call targets:
ninja man/man
ninja man/html
ninja man/update-man-rules

man/meson.build
meson.build

index a93693c43cc0b0d9f1adbb76b1676e05000b6d7a..8ddbd5557cbcf488642c05f8a8e1b481f5be8211 100644 (file)
@@ -170,10 +170,10 @@ man = custom_target(
         depends : man_pages,
         command : ['echo'])
 
-html = run_target(
+html = custom_target(
         'html',
-        depends : html_pages,
         output : 'html',
+        depends : html_pages,
         command : ['echo'])
 
 run_target(
@@ -191,8 +191,9 @@ run_target(
 ############################################################
 
 if git.found()
-        run_target(
+        custom_target(
                 'update-man-rules',
+                output : 'update-man-rules',
                 # slightly strange syntax because of
                 # https://github.com/mesonbuild/meson/issues/1643
                 # and https://github.com/mesonbuild/meson/issues/1512
index fbc4807c9529dcf834c0c6cb08a2bc46a6a73168..9a8f93f0cfc3096651f361ce314c451855326207 100644 (file)
@@ -2344,13 +2344,13 @@ if git.found()
                  ':/*.[ch]'])
         all_files = files(all_files.stdout().split())
 
-        run_target(
+        custom_target(
                 'tags',
-                input : all_files,
+                output : 'tags',
                 command : ['env', 'etags', '-o', '@0@/TAGS'.format(meson.source_root())] + all_files)
-        run_target(
+        custom_target(
                 'ctags',
-                input : all_files,
+                output : 'ctags',
                 command : ['env', 'ctags', '-o', '@0@/tags'.format(meson.source_root())] + all_files)
 endif