Use meson.build in subdir

Author: hongquan

meson.build

@@ -32,72 +32,7 @@ common_c_args = [
         '-DLIBSYSTEMD_VERSION=' + libsystemd_dep.version(),
 ]
 
-# Build _journal extension module
-python.extension_module(
-        '_journal',
-        ['systemd/_journal.c', 'systemd/pyutil.c'],
-        dependencies: [libsystemd_dep],
-        c_args: common_c_args,
-        install: true,
-        subdir: 'systemd',
-)
-
-# Build _reader extension module
-python.extension_module(
-        '_reader',
-        ['systemd/_reader.c', 'systemd/pyutil.c', 'systemd/strv.c'],
-        dependencies: [libsystemd_dep],
-        c_args: common_c_args,
-        install: true,
-        subdir: 'systemd',
-)
-
-# Build _daemon extension module
-python.extension_module(
-        '_daemon',
-        ['systemd/_daemon.c', 'systemd/pyutil.c', 'systemd/util.c'],
-        dependencies: [libsystemd_dep],
-        c_args: common_c_args,
-        install: true,
-        subdir: 'systemd',
-)
-
-# Build id128 extension module
-python.extension_module(
-        'id128',
-        ['systemd/id128.c', 'systemd/pyutil.c'],
-        dependencies: [libsystemd_dep],
-        c_args: common_c_args,
-        install: true,
-        subdir: 'systemd',
-)
-
-# Build login extension module
-python.extension_module(
-        'login',
-        ['systemd/login.c', 'systemd/pyutil.c', 'systemd/strv.c'],
-        dependencies: [libsystemd_dep],
-        c_args: common_c_args,
-        install: true,
-        subdir: 'systemd',
-)
-
-# Install Python modules (matching py_modules in setup.py)
-python.install_sources(
-        'systemd/__init__.py',
-        'systemd/journal.py',
-        'systemd/daemon.py',
-        subdir: 'systemd',
-)
-
-# Install test modules
-python.install_sources(
-        'systemd/test/test_daemon.py',
-        'systemd/test/test_journal.py',
-        'systemd/test/test_login.py',
-        'systemd/test/test_id128.py',
-        subdir: 'systemd/test',
-)
+subdir('systemd')
 
 run_target(
         'update-constants',

systemd/meson.build

@@ -0,0 +1,60 @@
+# Build _journal extension module
+python.extension_module(
+        '_journal',
+        ['_journal.c', 'pyutil.c'],
+        dependencies: [libsystemd_dep],
+        c_args: common_c_args,
+        install: true,
+)
+
+# Build _reader extension module
+python.extension_module(
+        '_reader',
+        ['_reader.c', 'pyutil.c', 'strv.c'],
+        dependencies: [libsystemd_dep],
+        c_args: common_c_args,
+        install: true,
+)
+
+# Build _daemon extension module
+python.extension_module(
+        '_daemon',
+        ['_daemon.c', 'pyutil.c', 'util.c'],
+        dependencies: [libsystemd_dep],
+        c_args: common_c_args,
+        install: true,
+)
+
+# Build id128 extension module
+python.extension_module(
+        'id128',
+        ['id128.c', 'pyutil.c'],
+        dependencies: [libsystemd_dep],
+        c_args: common_c_args,
+        install: true,
+)
+
+# Build login extension module
+python.extension_module(
+        'login',
+        ['login.c', 'pyutil.c', 'strv.c'],
+        dependencies: [libsystemd_dep],
+        c_args: common_c_args,
+        install: true,
+)
+
+# Install Python modules (matching py_modules in setup.py)
+python.install_sources(
+        '__init__.py',
+        'journal.py',
+        'daemon.py',
+)
+
+# Install test modules
+python.install_sources(
+        'test/test_daemon.py',
+        'test/test_journal.py',
+        'test/test_login.py',
+        'test/test_id128.py',
+        subdir: 'test',
+)

update-constants.py

@@ -2,7 +2,6 @@
 Read definitions from /usr/include/systemd/sd-messages.h and systemd/id128-defines.h files, convert to ones in systemd/id128-constants.h
 """
 
-import os
 import re
 import sys
 import itertools