]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: use run_target instead of custom_target where appropriate
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 17 Apr 2017 23:48:20 +0000 (19:48 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 24 Apr 2017 01:47:29 +0000 (21:47 -0400)
This way a fake output does not need to be specified.

hwdb/meson.build
man/meson.build
meson.build

index b9fc5ab5942cefa7910d498a7aa5e057e997af20..d6e858311a6b53c7b3c885e502e4409a75bf8a17 100644 (file)
@@ -31,7 +31,6 @@ endif
 
 ############################################################
 
-custom_target(
+run_target(
         'update',
-        output : 'update',
         command : [hwdb_update_sh, meson.current_source_dir()])
index 1c1dbd86b742d3d1517666cbe4aab694b8c75d6c..79d7710d11b81251633c005694868313933d82d0 100644 (file)
@@ -130,24 +130,25 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
         html_pages += [p2]
 endforeach
 
-man = custom_target('man',
-                    depends : man_pages,
-                    output : 'man',
-                    command : ['echo'])
-
-html = custom_target('html',
-                     depends : html_pages,
-                     output : 'html',
-                     command : ['echo'])
-
-custom_target('doc-sync',
-              depends : [man, html],
-              output : ['doc-sync'],
-              command : ['rsync', '-rlv',
-                         '--delete-excluded',
-                         '--include=man',
-                         '--include=*.html',
-                         '--exclude=*',
-                         '--omit-dir-times',
-                         meson.current_build_dir(),
-                         get_option('www-target')])
+man = run_target(
+        'man',
+        depends : man_pages,
+        command : ['echo'])
+
+html = run_target(
+        'html',
+        depends : html_pages,
+        output : 'html',
+        command : ['echo'])
+
+run_target(
+        'doc-sync',
+        depends : man_pages + html_pages,
+        command : ['rsync', '-rlv',
+                   '--delete-excluded',
+                   '--include=man',
+                   '--include=*.html',
+                   '--exclude=*',
+                   '--omit-dir-times',
+                   meson.current_build_dir(),
+                   get_option('www-target')])
index b1deb321445af76b3edfbd542a4145b32c39d602..4690619e54ce91e19b810fe5b58a716dc0beae13 100644 (file)
@@ -2278,8 +2278,7 @@ endif
 
 if git.found()
         meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh')
-        custom_target(
+        run_target(
                 'git-contrib',
-                output : 'git-contrib',
                 command : [meson_git_contrib_sh])
 endif