meson: update generating lists

- config.h is not necessary when generating lists, hence drop it.
- linux/audit.h and libaudit.h are included by missing_audit.h,
  hence not necessary to include them explicitly.

diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh
index b0814854e3974ab0b8a5d0a0b19e76b6c4d7cafb..4fec46a2ef7781669e28978834ddf43e7fc8f98c 100755 (executable)
--- a/src/basic/generate-af-list.sh
+++ b/src/basic/generate-af-list.sh
@@ -3,6 +3,6 @@
 set -eu
 set -o pipefail
 
-${1:?} -E -dM -include sys/socket.h -include "${2:?}" -include "${3:?}" - </dev/null | \
+${1:?} -E -dM -include sys/socket.h -include "${2:?}" - </dev/null | \
        grep -Ev 'AF_UNSPEC|AF_MAX' | \
        awk '/^#define[ \t]+AF_[^ \t]+[ \t]+[AP]F_[^ \t]/ { print $2; }'

diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh
index 7ba834ff1c566e173caa055356f1a228a7ac8141..5727a23dabf1241ee3ed0ab230ad785fd00e1e8e 100755 (executable)
--- a/src/basic/generate-arphrd-list.sh
+++ b/src/basic/generate-arphrd-list.sh
@@ -3,6 +3,6 @@
 set -eu
 set -o pipefail
 
-${1:?} -dM -include "${2:?}" -include "${3:?}" - </dev/null | \
+${1:?} -dM -include "${2:?}" - </dev/null | \
        awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
        sed -e 's/ARPHRD_//'

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 1b4b12108c910d5833c975e51d47c2c3cd040035..052b1451042986f3432f0ef982ca9783ede0a208 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -121,7 +121,6 @@ basic_sources = files(
 sources += basic_sources
 
 missing_audit_h = files('missing_audit.h')
-missing_socket_h = files('missing_socket.h')
 
 missing_syscall_def_h = files('missing_syscall_def.h')
 basic_sources += missing_syscall_def_h
@@ -130,14 +129,14 @@ generate_af_list = find_program('generate-af-list.sh')
 af_list_txt = custom_target(
         'af-list.txt',
         output : 'af-list.txt',
-        command : [generate_af_list, cpp, config_h, missing_socket_h],
+        command : [generate_af_list, cpp, files('missing_socket.h')],
         capture : true)
 
 generate_arphrd_list = find_program('generate-arphrd-list.sh')
 arphrd_list_txt = custom_target(
         'arphrd-list.txt',
         output : 'arphrd-list.txt',
-        command : [generate_arphrd_list, cpp, files('include/linux/if_arp.h'), config_h],
+        command : [generate_arphrd_list, cpp, files('include/linux/if_arp.h')],
         capture : true)
 
 generate_cap_list = find_program('generate-cap-list.sh')

diff --git a/src/libsystemd/sd-journal/meson.build b/src/libsystemd/sd-journal/meson.build
index f49b59a7c125bc768d86d8571cf412165a9d134e..1cc715c86c05f9239d005ecfc40e8ccb4b3d01ed 100644 (file)
--- a/src/libsystemd/sd-journal/meson.build
+++ b/src/libsystemd/sd-journal/meson.build
@@ -12,18 +12,11 @@
 # the custom_target() has to be defined here in src/libsystemd/sd-journal
 # in the source directory.
 
-audit_type_includes = [config_h,
-                       missing_audit_h,
-                       'linux/audit.h']
-if conf.get('HAVE_AUDIT') == 1
-        audit_type_includes += 'libaudit.h'
-endif
-
 generate_audit_type_list = find_program('generate-audit_type-list.sh')
 audit_type_list_txt = custom_target(
         'audit_type-list.txt',
         output : 'audit_type-list.txt',
-        command : [generate_audit_type_list, cpp] + audit_type_includes,
+        command : [generate_audit_type_list, cpp, missing_audit_h],
         capture : true)
 
 audit_type_to_name = custom_target(